LineageOS/android_vendor_qcom_opensource_power
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Power: Using only v3 powerhal version for this branch" into power.lnx.6.0

Browse Source
This commit is contained in:
Linux Build Service Account
2023-08-10 23:23:11 -07:00
committed by Gerrit - the friendly Code Review server
parent 451dff40fc d56cbc9729
commit 0a0093dbcb
4 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Android.mk
View File

@@ -8,16 +8,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
# KEYSTONE(I1132378f14428bf511f3cea4f419e90a6e89f823,b/181709127)
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
endif
ifeq ($(call math_gt_or_eq, 34, $(PLATFORM_SDK_VERSION)), true)
LOCAL_SHARED_LIBRARIES += android.hardware.power-V4-ndk
else
LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk_platform
endif
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils libbinder_ndk android.hardware.power-V3-ndk
LOCAL_HEADER_LIBRARIES += libutils_headers
LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -108,11 +99,7 @@ LOCAL_INIT_RC := android.hardware.power-service.rc
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable
LOCAL_VENDOR_MODULE := true
ifeq ($(PLATFORM_SDK_VERSION), 34)
LOCAL_VINTF_FRAGMENTS := /vintf/sdk34/power.xml
else
LOCAL_VINTF_FRAGMENTS := power.xml
endif
include $(BUILD_EXECUTABLE)
endif

12
PowerHintSession.cpp
View File

@@ -31,15 +31,3 @@ ndk::ScopedAStatus PowerHintSessionImpl::resume(){
ndk::ScopedAStatus PowerHintSessionImpl::close(){
return ndk::ScopedAStatus::ok();
}
#if (PLATFORM_SDK_VERSION >= 34)
ndk::ScopedAStatus PowerHintSessionImpl::sendHint(aidl::android::hardware::power::SessionHint hint){
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus PowerHintSessionImpl::setThreads(const std::vector<int32_t>& threadIds){
if (threadIds.size() == 0) {
LOG(ERROR) << "Error: threadIds.size() shouldn't be " << threadIds.size();
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
return ndk::ScopedAStatus::ok();
}
#endif

9
PowerHintSession.h
View File

@@ -8,9 +8,6 @@
#include <aidl/android/hardware/power/WorkDuration.h>
#include <aidl/android/hardware/power/BnPowerHintSession.h>
#if (PLATFORM_SDK_VERSION >= 34)
#include <aidl/android/hardware/power/SessionHint.h>
#endif
std::shared_ptr<aidl::android::hardware::power::IPowerHintSession> setPowerHintSession();
int64_t getSessionPreferredRate();
@@ -23,9 +20,5 @@ public:
ndk::ScopedAStatus pause() override;
ndk::ScopedAStatus resume() override;
ndk::ScopedAStatus close() override;
#if (PLATFORM_SDK_VERSION >= 34)
ndk::ScopedAStatus sendHint(aidl::android::hardware::power::SessionHint hint) override;
ndk::ScopedAStatus setThreads(const std::vector<int32_t>& threadIds) override;
#endif
};
#endif /* __POWERHINTSESSION__ */
#endif /* __POWERHINTSESSION__ */

11
vintf/sdk34/power.xml
View File

@@ -1,11 +0,0 @@
<!--
Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
SPDX-License-Identifier: BSD-3-Clause-Clear
-->
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.power</name>
<version>4</version>
<fqname>IPower/default</fqname>
</hal>
</manifest>