From 12c436b395a9d5adcf159a1382a27a155171d39d Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 15:59:27 +0800 Subject: [PATCH 1/5] Revert "haptics: update hapitcs sink and slot setting" This reverts commit be92d60ec5abae7f1ea40cd7ce22d1fc6cca804d. Bug: 278018625 Test: Check audio coupled haptics at the sound preview app. Change-Id: I35d52c31015c13670fc6d4e8ef57a3d0ea641391 --- audio/husky/config/mixer_paths.xml | 2 +- audio/ripcurrent/config/mixer_paths.xml | 4 ++-- audio/shiba/config/mixer_paths.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/husky/config/mixer_paths.xml b/audio/husky/config/mixer_paths.xml index 8e3c6b0..8845f54 100644 --- a/audio/husky/config/mixer_paths.xml +++ b/audio/husky/config/mixer_paths.xml @@ -42,7 +42,7 @@ - + diff --git a/audio/ripcurrent/config/mixer_paths.xml b/audio/ripcurrent/config/mixer_paths.xml index 339f625..6bbe394 100644 --- a/audio/ripcurrent/config/mixer_paths.xml +++ b/audio/ripcurrent/config/mixer_paths.xml @@ -39,8 +39,8 @@ - - + + diff --git a/audio/shiba/config/mixer_paths.xml b/audio/shiba/config/mixer_paths.xml index 8e3c6b0..8845f54 100644 --- a/audio/shiba/config/mixer_paths.xml +++ b/audio/shiba/config/mixer_paths.xml @@ -42,7 +42,7 @@ - + From 9740e95d13591a2d7127715a36f1d3fccbffc547 Mon Sep 17 00:00:00 2001 From: leohsieh Date: Tue, 14 Mar 2023 23:21:20 +0800 Subject: [PATCH 2/5] hk3sb3: Enable runtime exposure compensation Bug: 267271482 Test: build and test fingerprint on device. Change-Id: Id8e983cbd4413aeb8c61adfdea018eae4c8b1289 --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 1e05080..d3de61f 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -251,6 +251,10 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.als_feed_forward_supported=true \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true +# Fingerprint exposure compensation +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.udfps.auto_exposure_compensation_supported=true + # Camera Vendor property PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true diff --git a/device-shiba.mk b/device-shiba.mk index 4dba843..2af1361 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -232,6 +232,10 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif +# Fingerprint exposure compensation +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.udfps.auto_exposure_compensation_supported=true + # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true From 944e6cd36d85e14e32283759e7dba44c004dcea4 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Fri, 26 May 2023 01:39:22 +0000 Subject: [PATCH 3/5] Add POF property Add those property for FinderService Bug: 283372320 Test: make Change-Id: I55d64b34441d42cee20a4fa6a34f797acb62c485 --- bluetooth/bt_vendor_overlay.conf | 2 -- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index b253158..5acb97b 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -16,5 +16,3 @@ BqrEventMaskValueUpdate = 295006 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus BtOpusEnabled = true - -POFEnable = true diff --git a/device-husky.mk b/device-husky.mk index 9f59fc3..8254476 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -100,6 +100,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# POF +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.finder.supported=true + # Spatial Audio PRODUCT_PACKAGES += \ libspatialaudio diff --git a/device-shiba.mk b/device-shiba.mk index 7484ea0..37210fe 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -91,6 +91,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# POF +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.finder.supported=true + # Spatial Audio PRODUCT_PACKAGES += \ libspatialaudio From d4c206cfcfa9ab8586793c7792daf49aba0cfeab Mon Sep 17 00:00:00 2001 From: Jing Wang Date: Tue, 30 May 2023 23:07:55 +0000 Subject: [PATCH 4/5] Revert "Revert^3 "shusky: disable parallel module loading"" This reverts commit eead637cec071f42eeee220909bffa8e9a887803. Reason for revert: b/284937144 Change-Id: I0538a9a57f4e202cab9701cb16dbd6ea1e55f859 --- husky/BoardConfig.mk | 6 ------ ripcurrent/BoardConfig.mk | 6 ------ shiba/BoardConfig.mk | 6 ------ 3 files changed, 18 deletions(-) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index a88a5c6..205ca79 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -14,12 +14,6 @@ # limitations under the License. # -# Enable load module in parallel -BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true - -# The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 - TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := husky TARGET_SCREEN_DENSITY := 520 diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index 9950fca..1b5c405 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -14,12 +14,6 @@ # limitations under the License. # -# Enable load module in parallel -BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true - -# The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 - TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ripcurrent TARGET_SCREEN_DENSITY := 440 diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 92ab17c..2acc2a4 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -14,12 +14,6 @@ # limitations under the License. # -# Enable load module in parallel -BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true - -# The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 - TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := shiba TARGET_SCREEN_DENSITY := 420 From 5344132e34d0c82537327414f8baeaf1b807a7dd Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Wed, 31 May 2023 11:14:57 +0800 Subject: [PATCH 5/5] init: fix world writeable on speaker.diag Bug: 284996147 Test: builds Change-Id: Ib85d06312a254d1f9483d5e5d006934c446a2006 Signed-off-by: Robert Lee --- conf/init.husky.rc | 1 + conf/init.ripcurrent.rc | 1 + conf/init.shiba.rc | 1 + 3 files changed, 3 insertions(+) diff --git a/conf/init.husky.rc b/conf/init.husky.rc index 17fb846..c21c473 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -39,6 +39,7 @@ on post-fs-data # Speaker amp permission chmod 644 /mnt/vendor/persist/audio/speaker.cal + chmod 644 /mnt/vendor/persist/audio/speaker.diag # Bluetooth on post-fs-data diff --git a/conf/init.ripcurrent.rc b/conf/init.ripcurrent.rc index a20c7ec..b4a3caf 100644 --- a/conf/init.ripcurrent.rc +++ b/conf/init.ripcurrent.rc @@ -32,6 +32,7 @@ on post-fs-data # Speaker amp permission chmod 644 /mnt/vendor/persist/audio/speaker.cal + chmod 644 /mnt/vendor/persist/audio/speaker.diag # Bluetooth on post-fs-data diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index 7f29af0..fe53956 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -35,6 +35,7 @@ on post-fs-data # Speaker amp permission chmod 644 /mnt/vendor/persist/audio/speaker.cal + chmod 644 /mnt/vendor/persist/audio/speaker.diag # Bluetooth on post-fs-data