From 41c8036687185ece0317295708671701f810b551 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 15 Dec 2023 01:02:25 +0000 Subject: [PATCH 01/30] Update panther SVN to 45 Bug: 313797924 Change-Id: Ic51e912dbb6b97e94db53ec90ff19b7bed3da8b3 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index c6f0794..d829a7e 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -311,7 +311,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=45 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 1a5cc95b869536a70fde95775e8d45f15fc6de88 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 15 Dec 2023 01:03:07 +0000 Subject: [PATCH 02/30] Update panther SVN to 46 Bug: 313797924 Change-Id: I79504284797b3f5c98e46a297904252f7d29a884 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index d829a7e..0b8a49b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -311,7 +311,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=45 + ro.vendor.build.svn=46 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From cffac0e70ef3cd3f86c1a765de909afbccc49052 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 15 Dec 2023 01:00:05 +0000 Subject: [PATCH 03/30] Update cheetah SVN to 45 Bug: 313797924 Change-Id: I15f7219291829046417e74850a8fa7c1085ead8c --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index f8e82fa..d7bb898 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -327,7 +327,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=45 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 2c3af28a46cbde59f715f87349ac3b3e401785d6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 15 Dec 2023 01:00:50 +0000 Subject: [PATCH 04/30] Update cheetah SVN to 46 Bug: 313797924 Change-Id: I5b4b28f570c65eb96cf503f80e7b44051dcfacf5 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index d7bb898..52f908a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -327,7 +327,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=45 + ro.vendor.build.svn=46 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 9458929b1052846d020879f201fc852c1fd0b339 Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Thu, 21 Dec 2023 17:13:11 +0800 Subject: [PATCH 05/30] wifi: Enable fast scan Enable fast scan and set the channel cache number to 10 Bug: 317012208 Test: Manual Change-Id: I41430f89070b621483972c449434d387b67658e4 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 8 ++++++++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index a0f0ac0..20f6bbc 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -165,4 +165,12 @@ regulatory approval (for example, FCC pre-approval is required according to "594280 D01 Software Configuration Control v02r01").--> true + + + true + + + 3 + diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index daa6e49..72b3674 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -165,4 +165,12 @@ regulatory approval (for example, FCC pre-approval is required according to "594280 D01 Software Configuration Control v02r01").--> true + + + true + + + 3 + From bbad2a774d6beea715993149d40b943e7c9503cf Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Mon, 25 Dec 2023 17:09:28 +0800 Subject: [PATCH 06/30] audio: support incall capture dl/ul concurrent recording Bug: 317726514 Test: Verified by test build Change-Id: I1cef31691a71501674b4810219af66bc7eae0673 Signed-off-by: Carter Hsu --- audio/cheetah/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../config/audio_policy_configuration_bluetooth_legacy_hal.xml | 2 +- .../config/audio_policy_configuration_le_offload_disabled.xml | 2 +- audio/panther/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../config/audio_policy_configuration_bluetooth_legacy_hal.xml | 2 +- .../config/audio_policy_configuration_le_offload_disabled.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml index 2180a8a..ffcfc7f 100644 --- a/audio/cheetah/config/audio_policy_configuration.xml +++ b/audio/cheetah/config/audio_policy_configuration.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml index f5c129f..0f38000 100644 --- a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 92d97af..efd85b1 100644 --- a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml index 7cf76e6..833ba9e 100644 --- a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/panther/config/audio_policy_configuration.xml b/audio/panther/config/audio_policy_configuration.xml index 2180a8a..ffcfc7f 100644 --- a/audio/panther/config/audio_policy_configuration.xml +++ b/audio/panther/config/audio_policy_configuration.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml index f5c129f..0f38000 100644 --- a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 92d97af..efd85b1 100644 --- a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml index 7cf76e6..833ba9e 100644 --- a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + From 688f385dae696b32273d79f7c4fda1c4256f1eb9 Mon Sep 17 00:00:00 2001 From: Aaron Ding Date: Wed, 27 Dec 2023 00:52:46 +0800 Subject: [PATCH 07/30] pantah: control the kernel by release configuration Bug: 317784824 Change-Id: Ib7533e29e13b814f1bf8c669f9163b98af45e469 Signed-off-by: Aaron Ding --- device-cheetah.mk | 9 +++++++++ device-panther.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 52f908a..408cbd5 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/pantah-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers +ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers +endif + $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) diff --git a/device-panther.mk b/device-panther.mk index 0b8a49b..6927d17 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/pantah-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers +ifdef RELEASE_GOOGLE_PANTHER_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers +endif + $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) From e865792f8abcba09d6a76fc556f5b6be67958a94 Mon Sep 17 00:00:00 2001 From: Xin Li Date: Thu, 4 Jan 2024 08:59:25 -0800 Subject: [PATCH 08/30] Remove PixelQualifiedNetworksService for AOSP builds. Bug: 309712809 Test: https://android-build.corp.google.com/builds/abtd/run/L26400030001089366 Change-Id: I96e873d254432097527a3d211864e738b2322cb7 --- self-extractors_cheetah/extract-lists.txt | 1 - .../google_devices/staging/Android.mk.template | 16 ---------------- .../google_devices/staging/device-partial.mk | 1 - self-extractors_panther/extract-lists.txt | 1 - .../google_devices/staging/Android.mk.template | 16 ---------------- .../google_devices/staging/device-partial.mk | 1 - 6 files changed, 36 deletions(-) diff --git a/self-extractors_cheetah/extract-lists.txt b/self-extractors_cheetah/extract-lists.txt index 9fc0800..c783a92 100644 --- a/self-extractors_cheetah/extract-lists.txt +++ b/self-extractors_cheetah/extract-lists.txt @@ -11,7 +11,6 @@ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ system_ext/priv-app/UwbVendorService/UwbVendorService.apk \ " ;; diff --git a/self-extractors_cheetah/google_devices/staging/Android.mk.template b/self-extractors_cheetah/google_devices/staging/Android.mk.template index 0e329a3..e70bcb5 100644 --- a/self-extractors_cheetah/google_devices/staging/Android.mk.template +++ b/self-extractors_cheetah/google_devices/staging/Android.mk.template @@ -22,22 +22,6 @@ ifneq ($(filter cheetah,$(TARGET_DEVICE)),) endif ifneq ($(filter cheetah,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := PixelQualifiedNetworksService -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := google -LOCAL_MODULE_CLASS := APPS -LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_cheetah/google_devices/staging/device-partial.mk b/self-extractors_cheetah/google_devices/staging/device-partial.mk index 45a4692..94b718d 100644 --- a/self-extractors_cheetah/google_devices/staging/device-partial.mk +++ b/self-extractors_cheetah/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ UwbVendorService \ diff --git a/self-extractors_panther/extract-lists.txt b/self-extractors_panther/extract-lists.txt index 63655a4..9f3c26f 100644 --- a/self-extractors_panther/extract-lists.txt +++ b/self-extractors_panther/extract-lists.txt @@ -10,7 +10,6 @@ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_panther/google_devices/staging/Android.mk.template b/self-extractors_panther/google_devices/staging/Android.mk.template index 7e7906a..484a2e3 100644 --- a/self-extractors_panther/google_devices/staging/Android.mk.template +++ b/self-extractors_panther/google_devices/staging/Android.mk.template @@ -22,22 +22,6 @@ ifneq ($(filter panther,$(TARGET_DEVICE)),) endif ifneq ($(filter panther,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := PixelQualifiedNetworksService -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := google -LOCAL_MODULE_CLASS := APPS -LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_panther/google_devices/staging/device-partial.mk b/self-extractors_panther/google_devices/staging/device-partial.mk index 38d2027..ce58ad8 100644 --- a/self-extractors_panther/google_devices/staging/device-partial.mk +++ b/self-extractors_panther/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ From 030e4c8a2848cfe85ad09da48f9f37c4b9b39086 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 15 Dec 2023 01:02:25 +0000 Subject: [PATCH 09/30] Update panther SVN to 45 Bug: 313797924 Change-Id: Ic51e912dbb6b97e94db53ec90ff19b7bed3da8b3 (cherry picked from commit 41c8036687185ece0317295708671701f810b551) Merged-In: Ic51e912dbb6b97e94db53ec90ff19b7bed3da8b3 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 0287f29..1ba8e3e 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=45 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 235070258a057afecd1b779fca41ee1dcfc7eb1d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 15 Dec 2023 01:00:05 +0000 Subject: [PATCH 10/30] Update cheetah SVN to 45 Bug: 313797924 Change-Id: I15f7219291829046417e74850a8fa7c1085ead8c (cherry picked from commit cffac0e70ef3cd3f86c1a765de909afbccc49052) Merged-In: I15f7219291829046417e74850a8fa7c1085ead8c --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index d90574c..172d419 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=45 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ae485a5a7c34aec587089f5b222560a90a257f24 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 15 Dec 2023 01:00:50 +0000 Subject: [PATCH 11/30] Update cheetah SVN to 46 Bug: 313797924 Change-Id: I5b4b28f570c65eb96cf503f80e7b44051dcfacf5 (cherry picked from commit 2c3af28a46cbde59f715f87349ac3b3e401785d6) Merged-In: I5b4b28f570c65eb96cf503f80e7b44051dcfacf5 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 172d419..1dddd89 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=45 + ro.vendor.build.svn=46 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From c8cf7c147cee9c11d91cc6aed477536f02718b2a Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 9 Jan 2024 05:20:01 +0000 Subject: [PATCH 12/30] gps: Update the aiding interval Bug: 309119807 Test: Verification at b/309119807#comment44 Change-Id: If1b3076558ff3dcc47f0ef6b303c2f6afdce8842 --- location/gps.xml | 4 +++- location/gps.xml.c10 | 4 +++- location/gps.xml.p10 | 4 +++- location/gps_user.xml | 4 +++- location/gps_user.xml.c10 | 4 +++- location/gps_user.xml.p10 | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 4dd4ceb..c17d9b6 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -60,7 +60,7 @@ CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" - ReAidingIntervalSec="1200" + ReAidingIntervalSec="3600" RuntimeSwLteFilterEnable="true" PpsDevice="/sys/class/pps/pps0/assert_elapsed" SensorsMask="0x244" @@ -93,6 +93,8 @@ MinGpsWeekNumber="2216" OnChipAccMask="50" EnableB1C="false" + + RTICacheTimeoutSec="3600" /> Date: Fri, 15 Dec 2023 01:03:07 +0000 Subject: [PATCH 13/30] Update panther SVN to 46 Bug: 313797924 Change-Id: I79504284797b3f5c98e46a297904252f7d29a884 (cherry picked from commit 1a5cc95b869536a70fde95775e8d45f15fc6de88) Merged-In: I79504284797b3f5c98e46a297904252f7d29a884 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 1ba8e3e..8696cda 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=45 + ro.vendor.build.svn=46 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 215acdae3f2f43070ec84792ba20b3d4dd88fa49 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 12 Jan 2024 20:01:50 +0000 Subject: [PATCH 14/30] Update pixel pitch of devices Bug: 319894241 Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT Test: manual Change-Id: I4103c0795d0df072bb2d5d13aaf7425664f73fc7 --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 +++ .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index eecb57f..4d8952e 100644 --- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -44,5 +44,8 @@ 60px + + + 49.6 diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index c0baa60..a675e21 100644 --- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -51,5 +51,8 @@ 16px + + + 61.0 From 4c9c90a5ade4c25aa60e2f5434b60b1a58c5cf4f Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 26 Jan 2024 16:38:52 +0800 Subject: [PATCH 15/30] powerstats: use display MRR state residency data provider Bug: 322453302 Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest Change-Id: I78ddca8aa7f4994157845545d01d6325dd09d5ed Signed-off-by: Darren Hsu --- powerstats/cheetah/service.cpp | 43 ++++++++++++++++++++-------------- powerstats/panther/service.cpp | 29 ++++++++++++++--------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/powerstats/cheetah/service.cpp b/powerstats/cheetah/service.cpp index fa16eb1..2f18abb 100644 --- a/powerstats/cheetah/service.cpp +++ b/powerstats/cheetah/service.cpp @@ -36,25 +36,32 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { // Add display residency stats - std::vector states = { - "Off", - "LP: 1440x3120@30", - "On: 1440x3120@10", - "On: 1440x3120@60", - "On: 1440x3120@120", - "HBM: 1440x3120@60", - "HBM: 1440x3120@120", - "LP: 1080x2340@30", - "On: 1080x2340@10", - "On: 1080x2340@60", - "On: 1080x2340@120", - "HBM: 1080x2340@60", - "HBM: 1080x2340@120"}; + struct stat buffer; + if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { + // time_in_state exists + addDisplayMrr(p); + } else { + // time_in_state doesn't exist + std::vector states = { + "Off", + "LP: 1440x3120@30", + "On: 1440x3120@10", + "On: 1440x3120@60", + "On: 1440x3120@120", + "HBM: 1440x3120@60", + "HBM: 1440x3120@120", + "LP: 1080x2340@30", + "On: 1080x2340@10", + "On: 1080x2340@60", + "On: 1080x2340@120", + "HBM: 1080x2340@60", + "HBM: 1080x2340@120"}; - p->addStateResidencyDataProvider(std::make_unique( - "Display", - "/sys/class/backlight/panel0-backlight/state", - states)); + p->addStateResidencyDataProvider(std::make_unique( + "Display", + "/sys/class/backlight/panel0-backlight/state", + states)); + } // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer( diff --git a/powerstats/panther/service.cpp b/powerstats/panther/service.cpp index 036faa4..b2861b6 100644 --- a/powerstats/panther/service.cpp +++ b/powerstats/panther/service.cpp @@ -34,18 +34,25 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { // Add display residency stats - std::vector states = { - "Off", - "LP: 1080x2400@30", - "On: 1080x2400@60", - "On: 1080x2400@90", - "HBM: 1080x2400@60", - "HBM: 1080x2400@90"}; + struct stat buffer; + if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { + // time_in_state exists + addDisplayMrr(p); + } else { + // time_in_state doesn't exist + std::vector states = { + "Off", + "LP: 1080x2400@30", + "On: 1080x2400@60", + "On: 1080x2400@90", + "HBM: 1080x2400@60", + "HBM: 1080x2400@90"}; - p->addStateResidencyDataProvider(std::make_unique( - "Display", - "/sys/class/backlight/panel0-backlight/state", - states)); + p->addStateResidencyDataProvider(std::make_unique( + "Display", + "/sys/class/backlight/panel0-backlight/state", + states)); + } // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer( From a478a7eca821ec66c1cdff2388e330ecdc0e1062 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 10 Jan 2024 05:44:36 +0000 Subject: [PATCH 16/30] Update cheetah SVN to 47 Bug: 313797924 Change-Id: I136009c29c9ed3c1ef771024442cc02709cbd5aa --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 1dddd89..1d33c4c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=46 + ro.vendor.build.svn=47 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 7399ea785bbf089cf7d210c447a8ce24a450d8a8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 26 Jan 2024 22:36:29 +0000 Subject: [PATCH 17/30] Update cheetah SVN to 48 Bug: 313797924 Change-Id: Ifb77fb17ffed3f36b6920270e9bc6219b4c6ac71 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 1d33c4c..7d5623d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=47 + ro.vendor.build.svn=48 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From deb1bfb51575129c29d5577745fcd37827e4c6d7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 10 Jan 2024 05:39:12 +0000 Subject: [PATCH 18/30] Update panther SVN to 47 Bug: 313797924 Change-Id: If876336aa39cc1971f66605480aa3ee4d8e7b19d --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 8696cda..24ceef2 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=46 + ro.vendor.build.svn=47 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 025917831e7cea500f57f2362bba4405cf637d08 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 26 Jan 2024 22:31:15 +0000 Subject: [PATCH 19/30] Update panther SVN to 48 Bug: 313797924 Change-Id: I1bb1f22f83e1a83f96ef482f84446b641e6a0ee1 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 24ceef2..d1eb719 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=47 + ro.vendor.build.svn=48 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 6be42ceb9eee0b451b53990c3cf61a8aa628c86d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sun, 28 Jan 2024 00:32:58 +0000 Subject: [PATCH 20/30] Update panther SVN to 49 Bug: 313797924 Change-Id: Ib81f50fc12fdeab0d3d0671b24108e363b709819 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 41fcdbd..3f0f353 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -320,7 +320,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=48 + ro.vendor.build.svn=49 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 4d9a2162230a0dbbdbde850a593a14c88d62c56c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sun, 28 Jan 2024 00:38:08 +0000 Subject: [PATCH 21/30] Update cheetah SVN to 49 Bug: 313797924 Change-Id: I501730a5edad628bf62ee9910c2a4a0f84d4e861 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ca61e6d..6b49007 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -336,7 +336,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=48 + ro.vendor.build.svn=49 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From d2f9a72a171b1e4ece830c9946ea872aac65bc4e Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 31 Jan 2024 22:26:25 +0000 Subject: [PATCH 22/30] Extend LE Audio allowlist candidate device Bug: 323247113 Test: tester manual test result via b/322564783 Change-Id: If36c9ba4382778115b9e25b9c92746f5dc3f1e86 --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 6b49007..3e66204 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -225,7 +225,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ diff --git a/device-panther.mk b/device-panther.mk index 3f0f353..399a1fa 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -195,7 +195,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 # Bluetooth EWP test tool From 185be4fbfa5b5b916eee24b47e7e8ab89928c0e2 Mon Sep 17 00:00:00 2001 From: Jacky Liu Date: Mon, 5 Feb 2024 20:48:12 +0800 Subject: [PATCH 23/30] Update i2c device paths Update i2c device paths with static bus numbers. Bug: 323447554 Test: Boot to home Change-Id: I1bbaf2a60dbf6ab85f6af6ad3601d7ef8d1b067e --- conf/init.cloudripper.rc | 40 ++++++++++++++++---------------- conf/init.pantah.rc | 20 ++++++++-------- powerstats/cheetah/service.cpp | 16 ++----------- powerstats/panther/service.cpp | 16 ++----------- powerstats/ravenclaw/service.cpp | 16 ++----------- 5 files changed, 36 insertions(+), 72 deletions(-) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index dc2ff6c..53c7e91 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -61,27 +61,27 @@ on property:vendor.all.modules.ready=1 chown system system /mnt/vendor/persist/haptics/cs40l26.cal chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/8-0043/calibration/f0_stored + chown system system /sys/bus/i2c/devices/8-0043/calibration/q_stored + chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored + chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state + chown system system /sys/bus/i2c/devices/8-0043/default/num_waves + chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/f0_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/q_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/redc_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/vibe_state - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/num_waves - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_offset - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/owt_free_space - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/8-0042/calibration/f0_stored + chown system system /sys/bus/i2c/devices/8-0042/calibration/q_stored + chown system system /sys/bus/i2c/devices/8-0042/calibration/redc_stored + chown system system /sys/bus/i2c/devices/8-0042/default/vibe_state + chown system system /sys/bus/i2c/devices/8-0042/default/num_waves + chown system system /sys/bus/i2c/devices/8-0042/default/f0_offset + chown system system /sys/bus/i2c/devices/8-0042/default/owt_free_space + chown system system /sys/bus/i2c/devices/8-0042/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/8-0042/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/8-0042/default/delay_before_stop_playback_us enable vendor.vibrator.cs40l26 enable vendor.vibrator.cs40l26-dual diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 7ce1aea..6c8ec43 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -78,15 +78,15 @@ on property:vendor.all.modules.ready=1 chown system system /mnt/vendor/persist/haptics chown system system /mnt/vendor/persist/haptics/cs40l26.cal - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/8-0043/calibration/f0_stored + chown system system /sys/bus/i2c/devices/8-0043/calibration/q_stored + chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored + chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state + chown system system /sys/bus/i2c/devices/8-0043/default/num_waves + chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us enable vendor.vibrator.cs40l26 diff --git a/powerstats/cheetah/service.cpp b/powerstats/cheetah/service.cpp index 2f18abb..18e0b7e 100644 --- a/powerstats/cheetah/service.cpp +++ b/powerstats/cheetah/service.cpp @@ -127,20 +127,8 @@ int main() { addDisplay(p); addUwb(p); - if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); - } else { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats"); } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); diff --git a/powerstats/panther/service.cpp b/powerstats/panther/service.cpp index b2861b6..6a49873 100644 --- a/powerstats/panther/service.cpp +++ b/powerstats/panther/service.cpp @@ -77,20 +77,8 @@ int main() { addGs201CommonDataProviders(p); addDisplay(p); - if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); - } else { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats"); } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); diff --git a/powerstats/ravenclaw/service.cpp b/powerstats/ravenclaw/service.cpp index f04acaf..31d1ee1 100644 --- a/powerstats/ravenclaw/service.cpp +++ b/powerstats/ravenclaw/service.cpp @@ -74,20 +74,8 @@ int main() { addGs201CommonDataProviders(p); addDisplay(p); - if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); - } else { - addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats"); } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); From 5d3f52f5d303a241ec44a2a401aa64f100c93b6d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 00:25:36 +0000 Subject: [PATCH 24/30] Update cheetah SVN to 50 Bug: 313797924 Change-Id: I92cd332e8402285c3c04115336f4b48825b86892 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3e66204..8836d38 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -336,7 +336,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=49 + ro.vendor.build.svn=50 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 6caf8b27772382aea45bc3f54a03102dd84b5b5d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 00:28:55 +0000 Subject: [PATCH 25/30] Update panther SVN to 50 Bug: 313797924 Change-Id: Ib1b477c7ff23b8c6894d3dc0370b66ed6f6fb841 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 399a1fa..a881809 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -320,7 +320,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=49 + ro.vendor.build.svn=50 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e13ee2800660c63a600b5a952f8e846e8a46ec52 Mon Sep 17 00:00:00 2001 From: George Chang Date: Mon, 19 Feb 2024 06:52:58 +0000 Subject: [PATCH 26/30] Enable NFC firmware logging Enable NFC firmware logging by default for better debuggability. Bug: 307999188 Bug: 325604333 Test: manual Change-Id: I987ec38aa564a0500be4d9bdf8f355ad2f7ea55e --- nfc/libnfc-hal-st-proto1.conf | 2 +- nfc/libnfc-hal-st.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nfc/libnfc-hal-st-proto1.conf b/nfc/libnfc-hal-st-proto1.conf index feb933a..33e1565 100644 --- a/nfc/libnfc-hal-st-proto1.conf +++ b/nfc/libnfc-hal-st-proto1.conf @@ -8,7 +8,7 @@ NFC_DEBUG_ENABLED=0 ############################################################################### # Vendor specific mode to enable FW (RF & SWP) traces. -STNFC_FW_DEBUG_ENABLED=0 +STNFC_FW_DEBUG_ENABLED=1 ############################################################################### # File used for NFA storage diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index f553e3d..ee5feaa 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -8,7 +8,7 @@ NFC_DEBUG_ENABLED=0 ############################################################################### # Vendor specific mode to enable FW (RF & SWP) traces. -STNFC_FW_DEBUG_ENABLED=0 +STNFC_FW_DEBUG_ENABLED=1 ############################################################################### # File used for NFA storage From 42ef7724843b58f419fa7e58c379bcad24580d53 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Thu, 29 Feb 2024 08:31:43 +0000 Subject: [PATCH 27/30] Revert "Extend LE Audio allowlist candidate device" This reverts commit d2f9a72a171b1e4ece830c9946ea872aac65bc4e. Reason for revert: no in plan for 24Q2 Bug: 327554841 Test: build Change-Id: I28d61ba3ed43bec45244cfc0b9010cb5e9f69688 --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 8836d38..0eb4b27 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -225,7 +225,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510 # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ diff --git a/device-panther.mk b/device-panther.mk index a881809..040d90c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -195,7 +195,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510 # Bluetooth EWP test tool From e70e9f8c096a9ebbf37ea9c10935cce0e85f05a5 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 27 Feb 2024 16:28:34 +0800 Subject: [PATCH 28/30] Initial Bootloader prebuilt for AP3% build Bug: 326002225 Change-Id: Id4b6ee47b34990c05d0cf1f97cef9add146b3dbb --- cheetah/BoardConfig.mk | 2 +- cloudripper/BoardConfig.mk | 2 +- device-cheetah.mk | 4 ++-- device-cloudripper.mk | 2 +- device-panther.mk | 4 ++-- device-ravenclaw.mk | 4 ++-- panther/BoardConfig.mk | 2 +- ravenclaw/BoardConfig.mk | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 3cedf15..645f56c 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -20,7 +20,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index c2dcfa0..c5f39fe 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/device-cheetah.mk b/device-cheetah.mk index 0eb4b27..eb12309 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -285,7 +285,7 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk @@ -307,7 +307,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 5d30dee..7e59c5c 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -157,7 +157,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk diff --git a/device-panther.mk b/device-panther.mk index 040d90c..bb23a15 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -265,7 +265,7 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk @@ -291,7 +291,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 2dcc35c..324bfde 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -147,7 +147,7 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk @@ -170,7 +170,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 81f4438..1717606 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -23,7 +23,7 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 8fc4e6a..1c21a93 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk From 3215f5d5c911617729570975a55b94cc22d0f4f5 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Thu, 29 Feb 2024 15:28:38 +0000 Subject: [PATCH 29/30] Enabling Observe mode Bug: 327601464 Test: Tested on local device Change-Id: Iae889477c5538643b062756ab5f0356403bd405d --- panther/rro_overlays/NfcOverlay/res/values/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml index d5bfd3d..43d41fc 100644 --- a/panther/rro_overlays/NfcOverlay/res/values/config.xml +++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml @@ -32,4 +32,5 @@ 97 + true From 22bf057262fa7e3823b74d8d084a00cdfb124cb6 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Thu, 29 Feb 2024 15:28:38 +0000 Subject: [PATCH 30/30] Enabling Observe mode Bug: 327601464 Test: Tested on local device Change-Id: If8ba846036c42269109717f1b8ca4d70f1a8116c --- cheetah/rro_overlays/NfcOverlay/res/values/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml index 0055264..2a576a6 100644 --- a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml @@ -32,4 +32,5 @@ 100 + true