diff options
| author | Michael Sun <michaelfsun@google.com> | 2020-11-06 17:39:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 17:39:23 +0000 |
| commit | 55d8f268a910ee93f35a59e053c50952180c152e (patch) | |
| tree | 157629f3001b312a942d5a13f130b9ce73a5ce72 | |
| parent | be29278c3ccee6f7d582899ec7b2e900eb332d7c (diff) | |
| parent | 307c8e8d535238ed9449800858022d74c1066769 (diff) | |
| download | libhardware_legacy-55d8f268a910ee93f35a59e053c50952180c152e.tar.gz | |
Merge "Update to use new android.system.suspend.control AIDL interface" am: 307c8e8d53
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617
Change-Id: I84df993d0c1b15769d60e2dcbf2c86fa66d97195
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | power_test.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
@@ -36,8 +36,8 @@ cc_test { srcs: ["power_test.cpp"], static_libs: ["libpower"], shared_libs: [ + "android.system.suspend.control.internal-cpp", "android.system.suspend@1.0", - "suspend_control_aidl_interface-cpp", ], test_suites: ["device-tests"], require_root: true, diff --git a/power_test.cpp b/power_test.cpp index d6e414d..32cff70 100644 --- a/power_test.cpp +++ b/power_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <android/system/suspend/ISuspendControlService.h> +#include <android/system/suspend/internal/ISuspendControlServiceInternal.h> #include <binder/IServiceManager.h> #include <gtest/gtest.h> #include <hardware_legacy/power.h> @@ -27,8 +27,8 @@ #include <vector> using android::sp; -using android::system::suspend::ISuspendControlService; -using android::system::suspend::WakeLockInfo; +using android::system::suspend::internal::ISuspendControlServiceInternal; +using android::system::suspend::internal::WakeLockInfo; using namespace std::chrono_literals; namespace android { @@ -94,13 +94,13 @@ class WakeLockTest : public ::testing::Test { public: virtual void SetUp() override { sp<IBinder> control = - android::defaultServiceManager()->getService(android::String16("suspend_control")); - ASSERT_NE(control, nullptr) << "failed to get the suspend control service"; - controlService = interface_cast<ISuspendControlService>(control); + android::defaultServiceManager()->getService(android::String16("suspend_control_internal")); + ASSERT_NE(control, nullptr) << "failed to get the internal suspend control service"; + controlService = interface_cast<ISuspendControlServiceInternal>(control); } // Returns true iff found. - bool findWakeLockInfoByName(const sp<ISuspendControlService>& service, const std::string& name, + bool findWakeLockInfoByName(const sp<ISuspendControlServiceInternal>& service, const std::string& name, WakeLockInfo* info) { std::vector<WakeLockInfo> wlStats; service->getWakeLockStats(&wlStats); @@ -114,7 +114,7 @@ class WakeLockTest : public ::testing::Test { } // All userspace wake locks are registered with system suspend. - sp<ISuspendControlService> controlService; + sp<ISuspendControlServiceInternal> controlService; }; // Test RAII properties of WakeLock destructor. |