From f195af9aa9639715f1c51047d71870916aa43797 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Wed, 24 Jan 2024 01:26:22 +0000 Subject: [PATCH 1/5] Change CPU UtilThreshold, DVFSHeadroom, TAPreferHighCap for Video Call Bug: 323257509 Test: odpm/framedrops (b/323257509#comment7) Change-Id: Ifdbee11c22e47feb6d45c9d3b14ea3c0de49f92f --- perf/powerhint-caiman.json | 6 +++--- perf/powerhint-komodo.json | 6 +++--- perf/powerhint-ripcurrentpro.json | 6 +++--- perf/powerhint-tokay.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 51fc33cd..ab523d17 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -2195,7 +2195,7 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "TAPreferHighCap", "Duration": 0, - "Value": "1" + "Value": "0" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -2279,13 +2279,13 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1024 1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 51fc33cd..5c39a044 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -2189,7 +2189,7 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferHighCap", "Duration": 0, - "Value": "1" + "Value": "0" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -2279,13 +2279,13 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1024 1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index a2c9444d..5f4a5507 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -2184,7 +2184,7 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "TAPreferHighCap", "Duration": 0, - "Value": "1" + "Value": "0" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -2268,13 +2268,13 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1024 1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 51fc33cd..ab523d17 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -2195,7 +2195,7 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "TAPreferHighCap", "Duration": 0, - "Value": "1" + "Value": "0" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -2279,13 +2279,13 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1024 1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", From b3d09dd103c370f2fbb67edbfe6287f94fd36063 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 13 Mar 2024 03:40:08 +0000 Subject: [PATCH 2/5] display: add display TE2 properties Add this property to enable the TE2 control in the composer. Bug: 307787644 Test: getprop | grep vendor.primarydisplay.fixed_te2 Change-Id: I493aa7471dcfd6c542d49fad07c724f50ecba3b9 --- device-caiman.mk | 3 +++ device-komodo.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index c306510e..a56d69c3 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -306,6 +306,9 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.primarydisplay.op.hs_switch_min_dbv=1088 \ vendor.primarydisplay.op.hist_delta_th=8 +# Display fixed TE2 +PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120 + # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 diff --git a/device-komodo.mk b/device-komodo.mk index 8965be4d..495c42da 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -78,6 +78,9 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.primarydisplay.op.hs_switch_min_dbv=1088 \ vendor.primarydisplay.op.hist_delta_th=8 +# Display fixed TE2 +PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120 + # Init files PRODUCT_COPY_FILES += \ device/google/caimito/conf/init.komodo.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.komodo.rc From 859c48630bade49fd708cfae053931da135a7a7b Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 28 Mar 2024 17:49:19 +0800 Subject: [PATCH 3/5] audio: add spatializer-offload-playback to sco device Bug: 330318667 Test: manually test Change-Id: If9a58843e6c7f96e6a3847f94afe27f12e6b2e3b --- audio/caiman/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++ audio/komodo/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++ audio/tokay/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml index 7f14007e..c8adc9fc 100644 --- a/audio/caiman/aidl_config/mixer_paths_aidl.xml +++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml @@ -895,6 +895,18 @@ + + + + + + + + + + + + diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml index 7f14007e..c8adc9fc 100644 --- a/audio/komodo/aidl_config/mixer_paths_aidl.xml +++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml @@ -895,6 +895,18 @@ + + + + + + + + + + + + diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml index 7f14007e..c8adc9fc 100644 --- a/audio/tokay/aidl_config/mixer_paths_aidl.xml +++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml @@ -895,6 +895,18 @@ + + + + + + + + + + + + From f45de4ef986551e5afa92eacc9e28a723c24eea1 Mon Sep 17 00:00:00 2001 From: Samridhi Date: Thu, 28 Mar 2024 18:28:31 +0000 Subject: [PATCH 4/5] Add pixelsupport sepolicy in caiman, komodo, tokay Bug: 329276535 Test: make selinux_policy, flash and test Change-Id: I2a5d41037f93f57b9915c9c0cde995c5ff00a611 --- device-caiman.mk | 1 + device-komodo.mk | 1 + device-tokay.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index c8fcdc9e..42a0e2db 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -52,6 +52,7 @@ include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/syna/syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk +include device/google/gs-common/pixelsupport/pixelsupport.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index 0bf7ba87..1f3ad7c8 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -52,6 +52,7 @@ include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/syna/syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk +include device/google/gs-common/pixelsupport/pixelsupport.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index ba120387..ef5391d0 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -42,6 +42,7 @@ include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/syna/syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk +include device/google/gs-common/pixelsupport/pixelsupport.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From 2f95a0f0cb66e25c24adb9772082796dd0275a13 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 29 Mar 2024 00:32:38 +0000 Subject: [PATCH 5/5] Set package name for threadnetwork HAL APEX The package name is used when signing the APEX. Bug: 331550816 Change-Id: I06e44a7f1bb37c96de5fb66fca992c819cb85a92 Test: m com.google.camito.hardware.threadnetwork --- threadnetwork/hal/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/threadnetwork/hal/Android.bp b/threadnetwork/hal/Android.bp index 074666f0..e2f658b1 100644 --- a/threadnetwork/hal/Android.bp +++ b/threadnetwork/hal/Android.bp @@ -7,6 +7,7 @@ prebuilt_etc { override_apex { name: "com.google.caimito.hardware.threadnetwork", base: "com.android.hardware.threadnetwork", + package_name: "com.google.android.hardware.threadnetwork", prebuilts: [ "caimito_threadnetwork_hal_service.rc", "threadnetwork-default.xml",