From 00abb59188fdcf90e6ea1d54ca55d98cf6b817cd Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 4 Aug 2023 09:53:33 +0800 Subject: [PATCH 1/4] audio: waves table update Release Notes: - Fixed buzzing distortion from new Barbie soundtrack (only affects volumes 25, 24, 23 in portrait and landscape modes) - Maintained overall timbre advantage (but with some slight warmth reduction) over previous projects on most content tested. - Some sibiliance - Some distortion still remains, but not high risk - Some pumping risk (same as RC) - DXO Mark returned same score of 140 for this tuning (same as RC) - No change to speaker-safe tuning - No change to BAACL tuning - No change to thermal throttle (safety 47C) Bug: 293477854 Test: manual test - Acoustic measurements (full report WIP) - Power testing based on VMON/IMON (low risk - less power than RC at vol 25-23 avg, similar power 22-1) - Thermal testing based on VMON/IMON (low risk - less power than RC 25-23 avg, similar power 22-20) Change-Id: If44a8a1c3e9a91b2ba6e9331880cb0506d00b79f Signed-off-by: Jasmine Cha --- audio/shiba/tuning/waves/waves_preset.mps | Bin 185126 -> 185494 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/shiba/tuning/waves/waves_preset.mps b/audio/shiba/tuning/waves/waves_preset.mps index 1b72f50bda27276ad7893913695ac71df6f7d0f9..86903f2a6f65e88578de5e39fd64c537d3fe7750 100644 GIT binary patch delta 5289 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 ZZ!HS9MrNAbaem>h3&W;-VK{Z5?mzAHt?vK; From ddf9fc174116000c7e37bfd0a957f6532e5d147b Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 3 Aug 2023 19:34:25 +0800 Subject: [PATCH 2/4] audio: new AIDL configuration xml Bug: 206737711 Test: mm Change-Id: Id3eac7b9f3af897cf6163ecc90b6f07960eb0acd --- .../audio_platform_configuration.xml | 118 ++++++++++++++++++ .../audio_platform_configuration_aidl.xml | 76 ----------- audio/husky/audio-tables.mk | 2 +- .../audio_platform_configuration.xml | 118 ++++++++++++++++++ .../audio_platform_configuration_aidl.xml | 76 ----------- audio/shiba/audio-tables.mk | 2 +- 6 files changed, 238 insertions(+), 154 deletions(-) create mode 100644 audio/husky/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/husky/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/shiba/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/shiba/aidl_config/audio_platform_configuration_aidl.xml diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..5700502 --- /dev/null +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + 0.01 + 0.02 + 0.04 + 0.10 + 0.21 + 0.47 + 1.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + + + + diff --git a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml deleted file mode 100644 index 64e6593..0000000 --- a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index c177750..8aae616 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -21,7 +21,7 @@ AUDIO_TABLE_FOLDER := husky ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..5700502 --- /dev/null +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + 0.01 + 0.02 + 0.04 + 0.10 + 0.21 + 0.47 + 1.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + + + + diff --git a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml deleted file mode 100644 index 64e6593..0000000 --- a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index b1d8cbc..9beaa0c 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -21,7 +21,7 @@ AUDIO_TABLE_FOLDER := shiba ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else From 5156c03b75ebf868de788d18d11ed86d128894b0 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Mon, 7 Aug 2023 21:00:07 +0000 Subject: [PATCH 3/4] Set PMU_POLL to 0 instead of setting SPC threshold to 100 for CAMERA_ZOOMING_BOOST Bug: 291979193 Test: Device boots okay with new powerhint file Change-Id: I466873b118d12e1d72a237df72fa5d278ee2405d (cherry picked from commit 0a99fb90e9cf0ab498239f378f2754d452dfe459) --- perf/powerhint-husky.json | 19 ++----------------- perf/powerhint-ripcurrent.json | 19 ++----------------- perf/powerhint-shiba.json | 19 ++----------------- 3 files changed, 6 insertions(+), 51 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 86438df..265c778 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -654,7 +654,6 @@ "Name": "PMU_LIT_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ - "100", "70", "42", "35", @@ -686,7 +685,6 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "100", "50", "30", "20", @@ -716,7 +714,6 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "100", "50", "22", "20" @@ -1207,21 +1204,9 @@ }, { "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_LIT_SPC_THRESHOLD", + "Node": "PMU_POLL", "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_MID_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_BIG_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" + "Value": "0" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index f745ec0..4118b77 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -637,7 +637,6 @@ "Name": "PMU_LIT_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ - "100", "70", "42", "35", @@ -669,7 +668,6 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "100", "50", "30", "20", @@ -699,7 +697,6 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "100", "50", "22", "20" @@ -1144,21 +1141,9 @@ }, { "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_LIT_SPC_THRESHOLD", + "Node": "PMU_POLL", "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_MID_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_BIG_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" + "Value": "0" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 3d56d8b..4fb526c 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -654,7 +654,6 @@ "Name": "PMU_LIT_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ - "100", "70", "42", "35", @@ -686,7 +685,6 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "100", "50", "30", "20", @@ -716,7 +714,6 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "100", "50", "22", "20" @@ -1207,21 +1204,9 @@ }, { "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_LIT_SPC_THRESHOLD", + "Node": "PMU_POLL", "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_MID_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_BIG_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" + "Value": "0" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", From 467eed525412813fee1855421e605df6372e12e3 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 2 Aug 2023 17:21:02 +0000 Subject: [PATCH 4/4] flag_stop_face_auth_on_display_off is true for this device Test: manual Bug: 290077758 Change-Id: I64508ab579319415d2c59629c68f8bc8f44afc40 Merged-In: I64508ab579319415d2c59629c68f8bc8f44afc40 --- .../packages/SystemUI/res/values/flags.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml new file mode 100644 index 0000000..3d4a679 --- /dev/null +++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml @@ -0,0 +1,22 @@ + + + + + true + +