commit 5c88f0216088f1aaa787ff5e9e449a5b9f165f28
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 07 21:19:47 2022 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 07 21:19:58 2022 -0700
tree ae4db1a1833a678b241d907e9bcff3fceb575065
parent 6990ba4b0bec685e73facb4f5da3181146d6153c
parent d7eb0bfdc72c00423f4945c912894a8e81db1308

Merge "Revert "power: update the AIDL client ver 3"" into power.lnx.5.0.r1-rel

Android.mk

diff --git a/Android.mk b/Android.mk
index 9d7f222..3b90046 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,7 +11,7 @@
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils libbinder_ndk
 
 ifeq ($(call math_gt_or_eq, 33, $(PLATFORM_SDK_VERSION)), true)
-    LOCAL_SHARED_LIBRARIES += android.hardware.power-V3-ndk
+    LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk
 else
     LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk_platform
 endif

Power.cpp

diff --git a/Power.cpp b/Power.cpp
index eadcef4..260ad4c 100644
--- a/Power.cpp
+++ b/Power.cpp
@@ -116,19 +116,9 @@
     *_aidl_return = false;
     return ndk::ScopedAStatus::ok();
 }
-ndk::ScopedAStatus Power::createHintSession(int32_t, int32_t, const std::vector<int32_t>&, int64_t,
-                                            std::shared_ptr<IPowerHintSession>* _aidl_return) {
-    *_aidl_return = nullptr;
-    return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
-}
-
-ndk::ScopedAStatus Power::getHintSessionPreferredRate(int64_t* outNanoseconds) {
-    *outNanoseconds = -1;
-    return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
-}
 
 }  // namespace impl
 }  // namespace power
 }  // namespace hardware
 }  // namespace android
-}  // namespace aidl
+}  // namespace aidl
\ No newline at end of file

Power.h

diff --git a/Power.h b/Power.h
index a66f4a2..c7c42b0 100644
--- a/Power.h
+++ b/Power.h
@@ -48,11 +48,6 @@
         ndk::ScopedAStatus isModeSupported(Mode type, bool* _aidl_return) override;
         ndk::ScopedAStatus setBoost(Boost type, int32_t durationMs) override;
         ndk::ScopedAStatus isBoostSupported(Boost type, bool* _aidl_return) override;
-        ndk::ScopedAStatus createHintSession(int32_t tgid, int32_t uid,
-                                             const std::vector<int32_t>& threadIds,
-                                             int64_t durationNanos,
-                                             std::shared_ptr<IPowerHintSession>* _aidl_return) override;
-        ndk::ScopedAStatus getHintSessionPreferredRate(int64_t* outNanoseconds) override;
 };
 
 }  // namespace impl