diff options
author | Michael Sun <michaelfsun@google.com> | 2020-11-06 19:40:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 19:40:26 +0000 |
commit | da329da59951029d4b4fc5bca477d2ac2c392c84 (patch) | |
tree | 643f681575e18cd15f2d0efb15f1262677713efb | |
parent | 85bac745111bc2a00c9a5bc7dca86ab208699df6 (diff) | |
parent | cadb0b395ec649861d5de641ce82944af5da4001 (diff) | |
download | libhardware_legacy-da329da59951029d4b4fc5bca477d2ac2c392c84.tar.gz |
Merge "Update to use new android.system.suspend.control AIDL interface" am: 307c8e8d53 am: 55d8f268a9 am: 2e4633d238 am: cadb0b395e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617
Change-Id: I9ac920d1abd0fd42ab68973caf4bdab5286e9bcb
-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. |