From 5112986f8ec6ceb81a0ecd0ab9abac6455225149 Mon Sep 17 00:00:00 2001 From: Greg Piecyk Date: Mon, 24 Jun 2024 21:47:21 +0000 Subject: [PATCH 1/7] [CM4] Add config.xml to OMA-DM package with DevInfo Model name. Set DevInfo Model name to GR83Y for Caiman (CM4). Bug: 347103742 Test: b/347103742 Change-Id: I8a718690fc392294b958a9487a679d7c7aec0a7b --- .../packages/apps/OMA-DM/DMService/res/values/config.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 caiman/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml diff --git a/caiman/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/caiman/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml new file mode 100644 index 00000000..694bf1f4 --- /dev/null +++ b/caiman/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml @@ -0,0 +1,8 @@ + + + + + + GR83Y + From 028bbe78f736e9caf0b77b8417bbe242514e9f58 Mon Sep 17 00:00:00 2001 From: Greg Piecyk Date: Mon, 24 Jun 2024 22:02:21 +0000 Subject: [PATCH 2/7] [KM4] Add config.xml to OMA-DM package with DevInfo Model name. Set DevInfo Model name to GGX8B for Komodo (KM4). Bug: 347344997 Change-Id: I0807bf4f0be5d5de3429168ce7a89fa79946a2cf Test: b/347344997 --- .../packages/apps/OMA-DM/DMService/res/values/config.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 komodo/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml diff --git a/komodo/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/komodo/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml new file mode 100644 index 00000000..45042d20 --- /dev/null +++ b/komodo/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml @@ -0,0 +1,8 @@ + + + + + + GGX8B + From d7efc013d3c40cd95f4b1082c78c547e64c47d65 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Tue, 25 Jun 2024 03:59:31 +0000 Subject: [PATCH 3/7] caimito: config serial no for vendor audio note: - To workaround microphone compensation issue, serial number is necessary information. Config the value for vendor audio service. Test: end-to-end test Bug: 349276230 Flag: EXEMPT bugfix Change-Id: Ia989fe39cf89055bb056e07875cc868edb808bdc --- conf/init.caiman.rc | 4 ++++ conf/init.komodo.rc | 4 ++++ conf/init.tokay.rc | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc index c63cfa7d..215e60d2 100644 --- a/conf/init.caiman.rc +++ b/conf/init.caiman.rc @@ -79,3 +79,7 @@ on property:sys.boot_completed=1 # it should be written by the system init. on property:ro.boot.hardware.sku=GWVK6 setprop audio.camerasound.force true + +# Check serial no. from specific CM4 devices for audio. +on property:ro.boot.serialno=* + setprop vendor.audio_hal.device.serialno ${ro.boot.serialno} diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc index 51d7027f..97a6e229 100644 --- a/conf/init.komodo.rc +++ b/conf/init.komodo.rc @@ -83,3 +83,7 @@ on property:sys.boot_completed=1 # it should be written by the system init. on property:ro.boot.hardware.sku=GQ57S setprop audio.camerasound.force true + +# Check serial no. from specific KM4 devices for audio. +on property:ro.boot.serialno=* + setprop vendor.audio_hal.device.serialno ${ro.boot.serialno} diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc index f0626726..99963f92 100644 --- a/conf/init.tokay.rc +++ b/conf/init.tokay.rc @@ -81,3 +81,7 @@ on fs # it should be written by the system init. on property:ro.boot.hardware.sku=G1B60 setprop audio.camerasound.force true + +# Check serial no. from specific TK4 devices for audio. +on property:ro.boot.serialno=* + setprop vendor.audio_hal.device.serialno ${ro.boot.serialno} From ca69c178aeee8a12ebbab98a06bfc8334e138c01 Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Wed, 19 Jun 2024 06:50:55 +0000 Subject: [PATCH 4/7] display: update reduceBrightColorsStrength setting Bug: 343327517 test: dumpsys color_display Change-Id: Iba176ea5a0b5b6e0ae90a560fc1d2853b6a3633c Merged-In: Iba176ea5a0b5b6e0ae90a560fc1d2853b6a3633c --- caiman/overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- komodo/overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/caiman/overlay/frameworks/base/core/res/res/values/config.xml b/caiman/overlay/frameworks/base/core/res/res/values/config.xml index b8e8e55f..024b6c4b 100644 --- a/caiman/overlay/frameworks/base/core/res/res/values/config.xml +++ b/caiman/overlay/frameworks/base/core/res/res/values/config.xml @@ -33,13 +33,13 @@ 6 - 50 + 35 25 - 75 + 50 diff --git a/komodo/overlay/frameworks/base/core/res/res/values/config.xml b/komodo/overlay/frameworks/base/core/res/res/values/config.xml index fee8b094..157f42c8 100644 --- a/komodo/overlay/frameworks/base/core/res/res/values/config.xml +++ b/komodo/overlay/frameworks/base/core/res/res/values/config.xml @@ -33,13 +33,13 @@ 6 - 50 + 35 25 - 75 + 50 From b07be951cc26c65150fea3c65f70078873f54e68 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Tue, 25 Jun 2024 09:31:24 +0000 Subject: [PATCH 5/7] caimito: add default mic compensation Test: end-to-end validation Bug: 349276230 Flag: EXEMPT bugfix Change-Id: I5775c77a215733e170676eb50a8d49ae4fd5ec93 --- audio/caiman/audio-tables.mk | 3 ++- audio/caiman/tuning/Android.bp | 6 ++++++ .../compensation/default_mic_compensation.bin | Bin 0 -> 196 bytes audio/komodo/audio-tables.mk | 3 ++- audio/komodo/tuning/Android.bp | 6 ++++++ .../compensation/default_mic_compensation.bin | Bin 0 -> 196 bytes audio/tokay/audio-tables.mk | 3 ++- audio/tokay/tuning/Android.bp | 6 ++++++ .../compensation/default_mic_compensation.bin | Bin 0 -> 196 bytes 9 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 audio/caiman/tuning/compensation/default_mic_compensation.bin create mode 100644 audio/komodo/tuning/compensation/default_mic_compensation.bin create mode 100644 audio/tokay/tuning/compensation/default_mic_compensation.bin diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk index 28f99cff..295be07d 100644 --- a/audio/caiman/audio-tables.mk +++ b/audio/caiman/audio-tables.mk @@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \ waves_config.ini \ waves_preset.mps \ compens_spk_l.conf \ - compens_spk_r.conf + compens_spk_r.conf \ + default_mic_compensation.bin # userdebug and eng specific PRODUCT_PACKAGES_DEBUG += \ diff --git a/audio/caiman/tuning/Android.bp b/audio/caiman/tuning/Android.bp index 54e6aa3a..e81b4e94 100644 --- a/audio/caiman/tuning/Android.bp +++ b/audio/caiman/tuning/Android.bp @@ -160,3 +160,9 @@ prebuilt_etc { filename_from_src: true, relative_install_path: "spatializer", } + +prebuilt_etc { + name: "default_mic_compensation.bin", + src: "compensation/default_mic_compensation.bin", + soc_specific: true, +} diff --git a/audio/caiman/tuning/compensation/default_mic_compensation.bin b/audio/caiman/tuning/compensation/default_mic_compensation.bin new file mode 100644 index 0000000000000000000000000000000000000000..8ad8840e09d5caeaecda35be9a9e680cb6768af0 GIT binary patch literal 196 zcmWe&U|`q-#LQ59SJ2e{d$j*P&P!kIKy=${d%N5x)%K!`#B6n6B!lT$XX5Rp>=W&8 zI||r$gvo>HMN=8H~qDH(^F@^ zxaX){|EV-ET^*ik-}FYqelBOlzOK!0>_D`w(Jx!8110unMC|rW=!*r@C;fu#n>woP R^V*W^)qkXb=@ktL_5cm`R73y( literal 0 HcmV?d00001 diff --git a/audio/komodo/audio-tables.mk b/audio/komodo/audio-tables.mk index 374b7842..1fd720f2 100644 --- a/audio/komodo/audio-tables.mk +++ b/audio/komodo/audio-tables.mk @@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \ waves_config.ini \ waves_preset.mps \ compens_spk_l.conf \ - compens_spk_r.conf + compens_spk_r.conf \ + default_mic_compensation.bin # userdebug and eng specific PRODUCT_PACKAGES_DEBUG += \ diff --git a/audio/komodo/tuning/Android.bp b/audio/komodo/tuning/Android.bp index 54e6aa3a..e81b4e94 100644 --- a/audio/komodo/tuning/Android.bp +++ b/audio/komodo/tuning/Android.bp @@ -160,3 +160,9 @@ prebuilt_etc { filename_from_src: true, relative_install_path: "spatializer", } + +prebuilt_etc { + name: "default_mic_compensation.bin", + src: "compensation/default_mic_compensation.bin", + soc_specific: true, +} diff --git a/audio/komodo/tuning/compensation/default_mic_compensation.bin b/audio/komodo/tuning/compensation/default_mic_compensation.bin new file mode 100644 index 0000000000000000000000000000000000000000..b8f3e90325f8e0785eaa685695f28f2a0244aca1 GIT binary patch literal 196 zcmWe&U|`q-#LQ5<^qQ!B?*87r533H@f#?HIocW7vV=>s!f+R5A~ Tw_o`;#Qyz~Brwfg8)XjwKigQ| literal 0 HcmV?d00001 diff --git a/audio/tokay/audio-tables.mk b/audio/tokay/audio-tables.mk index 15e50240..5aadc3e6 100644 --- a/audio/tokay/audio-tables.mk +++ b/audio/tokay/audio-tables.mk @@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \ waves_config.ini \ waves_preset.mps \ compens_spk_l.conf \ - compens_spk_r.conf + compens_spk_r.conf \ + default_mic_compensation.bin # userdebug and eng specific PRODUCT_PACKAGES_DEBUG += \ diff --git a/audio/tokay/tuning/Android.bp b/audio/tokay/tuning/Android.bp index 54e6aa3a..e81b4e94 100644 --- a/audio/tokay/tuning/Android.bp +++ b/audio/tokay/tuning/Android.bp @@ -160,3 +160,9 @@ prebuilt_etc { filename_from_src: true, relative_install_path: "spatializer", } + +prebuilt_etc { + name: "default_mic_compensation.bin", + src: "compensation/default_mic_compensation.bin", + soc_specific: true, +} diff --git a/audio/tokay/tuning/compensation/default_mic_compensation.bin b/audio/tokay/tuning/compensation/default_mic_compensation.bin new file mode 100644 index 0000000000000000000000000000000000000000..d4d82c2934be7ad3ee1c61de013600609a1771a6 GIT binary patch literal 196 zcmWe&U|`q-#LQ3}`>E2tYue=fXX@0!v}U2Ay|=Kpee$0P`yS1f0Mn6i$L;uk+1XFr zG}ms;v3+(RTJ`lO+uRsE`%AaC?dw|h-VQ_`-zQw5B62;`)voJuZm{ct!FK>mu^_IZ`-*5Fr9kE&Hgic Tg8jDgsy!DU@Pg^ii?{6n{T^B5 literal 0 HcmV?d00001 From 0f93229c1921c5919b2b839586ac780cb12ca2e3 Mon Sep 17 00:00:00 2001 From: Kurt Huang Date: Tue, 2 Jul 2024 03:10:44 +0000 Subject: [PATCH 6/7] powerhint: set valid PMU_BIG_SPC_THRESHOLD for CAMERA_PROJECT11 http://ag/27702721 removed value 50 from PMU_BIG_SPC_THRESHOLD. Set the value to 20 for CAMERA_PROJECT11. Bug: 347647774 Test: Flash on ripcurrentpro board and boot Change-Id: I20aa20119ab8317d3ba92b8118d34f3b9e884b66 --- perf/powerhint-ripcurrentpro.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index a64f048f..cec9352c 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -3018,7 +3018,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "50" + "Value": "20" }, { "PowerHint": "CAMERA_PROJECT11", From 7c8f65bf43c690f47cf4898daf346531738eb121 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 3 Jul 2024 02:07:48 +0000 Subject: [PATCH 7/7] Update SVN to 2 Bug: 350826665 Change-Id: I2fb755d247f2efffa2f1c84322b52d33367d5cdb --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 55a8b5f8..d37b4c91 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index 99a9ab2e..a614f2a6 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index 7239eadf..23bf0357 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -60,7 +60,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay)