Switch to use stable power HAL
Bug: 154570109
Test: build and capture the trace to check
Change-Id: I4794f44266762672ef3b6ad9bf1353f6784e34d6
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 734d496..09d682f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -196,3 +196,6 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/first_stage_ramdisk/avb/q-gsi.avbpubkey)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/first_stage_ramdisk/avb/r-gsi.avbpubkey)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/first_stage_ramdisk/avb/s-gsi.avbpubkey)
+
+# Use stable aidl power HAL
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power@1.3-service.pixel-libperfmgr.rc)
diff --git a/device.mk b/device.mk
index 366e8cf..764b230 100644
--- a/device.mk
+++ b/device.mk
@@ -233,10 +233,6 @@
frameworks/native/data/etc/android.hardware.strongbox_keystore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.strongbox_keystore.xml \
frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml \
-# power HAL
-PRODUCT_PACKAGES += \
- android.hardware.power@1.3-service.pixel-libperfmgr
-
# powerstats HAL
PRODUCT_PACKAGES += \
android.hardware.power.stats@1.0-service.pixel
@@ -898,3 +894,6 @@
include hardware/google/pixel/pixelstats/device.mk
include hardware/google/pixel/mm/device_legacy.mk
include hardware/google/pixel/thermal/device.mk
+
+# power HAL
+-include hardware/google/pixel/power-libperfmgr/aidl/device.mk
diff --git a/powerhint.json b/powerhint.json
index d272cd1..15f4193 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -206,9 +206,6 @@
"Name": "PowerHALMainState",
"Path": "vendor.powerhal.state",
"Values": [
- "CAMERA_STREAMING",
- "CAMERA_STREAMING_1080P",
- "CAMERA_STREAMING_4K",
"SUSTAINED_PERFORMANCE",
""
],
@@ -218,16 +215,7 @@
"Name": "PowerHALAudioState",
"Path": "vendor.powerhal.audio",
"Values": [
- "AUDIO_LOW_LATENCY",
- ""
- ],
- "Type": "Property"
- },
- {
- "Name": "PowerHALRenderingState",
- "Path": "vendor.powerhal.rendering",
- "Values": [
- "EXPENSIVE_RENDERING",
+ "AUDIO_STREAMING_LOW_LATENCY",
""
],
"Type": "Property"
@@ -421,49 +409,31 @@
"Value": "67"
},
{
- "PowerHint": "CAMERA_STREAMING",
- "Node": "PowerHALMainState",
- "Duration": 0,
- "Value": "CAMERA_STREAMING"
- },
- {
- "PowerHint": "CAMERA_STREAMING",
+ "PowerHint": "CAMERA_STREAMING_MID",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1996800"
},
{
- "PowerHint": "CAMERA_STREAMING_1080P",
- "Node": "PowerHALMainState",
- "Duration": 0,
- "Value": "CAMERA_STREAMING_1080P"
- },
- {
- "PowerHint": "CAMERA_STREAMING_1080P",
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1996800"
},
{
- "PowerHint": "CAMERA_STREAMING_1080P",
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "GPUMinFreq",
"Duration": 0,
"Value": "430000000"
},
{
- "PowerHint": "CAMERA_STREAMING_1080P",
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "GPUMaxFreq",
"Duration": 0,
"Value": "430000000"
},
{
- "PowerHint": "CAMERA_STREAMING_4K",
- "Node": "PowerHALMainState",
- "Duration": 0,
- "Value": "CAMERA_STREAMING_4K"
- },
- {
- "PowerHint": "CAMERA_STREAMING_4K",
+ "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1996800"
@@ -499,46 +469,28 @@
"Value": "67"
},
{
- "PowerHint": "AUDIO_STREAMING",
+ "PowerHint": "AUDIO_LAUNCH",
"Node": "CPUBigClusterMinFreq",
"Duration": 2000,
"Value": "1363200"
},
{
- "PowerHint": "AUDIO_STREAMING",
+ "PowerHint": "AUDIO_LAUNCH",
"Node": "PMQoSCpuDmaLatency",
"Duration": 2000,
"Value": "67"
},
{
- "PowerHint": "AUDIO_LOW_LATENCY",
+ "PowerHint": "AUDIO_STREAMING_LOW_LATENCY",
"Node": "PowerHALAudioState",
"Duration": 0,
- "Value": "AUDIO_LOW_LATENCY"
+ "Value": "AUDIO_STREAMING_LOW_LATENCY"
},
{
- "PowerHint": "AUDIO_LOW_LATENCY",
+ "PowerHint": "AUDIO_STREAMING_LOW_LATENCY",
"Node": "PMQoSCpuDmaLatency",
"Duration": 0,
"Value": "67"
- },
- {
- "PowerHint": "EXPENSIVE_RENDERING",
- "Node": "PowerHALRenderingState",
- "Duration": 0,
- "Value": "EXPENSIVE_RENDERING"
- },
- {
- "PowerHint": "EXPENSIVE_RENDERING",
- "Node": "GPUMinFreq",
- "Duration": 0,
- "Value": "355000000"
- },
- {
- "PowerHint": "EXPENSIVE_RENDERING",
- "Node": "GPUMaxFreq",
- "Duration": 0,
- "Value": "430000000"
}
]
}
