diff --git a/OWNERS b/OWNERS
index 5aee848..61b3e45 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,4 @@
per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
+
+# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS
diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
new file mode 100644
index 0000000..912b4aa
--- /dev/null
+++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml
new file mode 100644
index 0000000..28c8663
--- /dev/null
+++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+ - Speaker
+ - Speaker Safe
+ - Earpiece
+ - Built-In Mic
+ - Built-In Back Mic
+ - Telephony Tx
+ - Voice Call And Telephony Rx
+ - Echo Ref In
+
+ Speaker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/cheetah/aidl_config/audio_policy_volumes.xml b/audio/cheetah/aidl_config/audio_policy_volumes.xml
new file mode 100644
index 0000000..04e731d
--- /dev/null
+++ b/audio/cheetah/aidl_config/audio_policy_volumes.xml
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-4700
+ 33,-3500
+ 66,-2350
+ 100,-1250
+
+
+
+
+
+
+ 1,-3350
+ 33,-2100
+ 66,-1000
+ 100,0
+
+
+
+
+
+
+
+
+
+
+
+ 0,-4800
+ 33,-2050
+ 66,-800
+ 100,0
+
+
+
+
+
+
+ 1,-3800
+ 33,-2600
+ 66,-1400
+ 100,0
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-4700
+ 33,-3500
+ 66,-2350
+ 100,-1250
+
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-5500
+ 33,-3650
+ 66,-2700
+ 100,-1800
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
new file mode 100644
index 0000000..894ef4e
--- /dev/null
+++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
@@ -0,0 +1,862 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk
index 3acd5ac..d4ce667 100644
--- a/audio/cheetah/audio-tables.mk
+++ b/audio/cheetah/audio-tables.mk
@@ -16,6 +16,18 @@
AUDIO_TABLE_FOLDER := cheetah
+# Enable this to build AIDL
+# BUILD_AUDIO_AIDL_VERSION := true
+
+ifeq ($(BUILD_AUDIO_AIDL_VERSION),true)
+# AIDL HAL configs are in the *config_aidl* folder
+PRODUCT_COPY_FILES += \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml
+else
+# HIDL HAL configs are in the *config* folder
# Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
@@ -34,6 +46,7 @@ PRODUCT_COPY_FILES += \
# Mixer Path Configuration for AudioHAL
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
+endif
# Speaker firmware files
SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw
@@ -44,6 +57,7 @@ PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*)
# Audio tuning
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/smartfeature.gstf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/smartfeature.gstf \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \
diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index 84ee3a5..5522ce1 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -304,7 +304,7 @@
-
+
diff --git a/audio/cheetah/tuning/bluenote/smartfeature.gstf b/audio/cheetah/tuning/bluenote/smartfeature.gstf
new file mode 100644
index 0000000..d174ae3
Binary files /dev/null and b/audio/cheetah/tuning/bluenote/smartfeature.gstf differ
diff --git a/audio/cloudripper/config/audio_platform_configuration.xml b/audio/cloudripper/config/audio_platform_configuration.xml
index d1428d5..8f74505 100644
--- a/audio/cloudripper/config/audio_platform_configuration.xml
+++ b/audio/cloudripper/config/audio_platform_configuration.xml
@@ -295,7 +295,7 @@
-
+
diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
new file mode 100644
index 0000000..912b4aa
--- /dev/null
+++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml
new file mode 100644
index 0000000..dfc8577
--- /dev/null
+++ b/audio/panther/aidl_config/audio_policy_configuration.xml
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+
+
+ - Speaker
+ - Speaker Safe
+ - Earpiece
+ - Built-In Mic
+ - Built-In Back Mic
+ - Telephony Tx
+ - Voice Call And Telephony Rx
+ - Echo Ref In
+
+ Speaker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/panther/aidl_config/audio_policy_volumes.xml b/audio/panther/aidl_config/audio_policy_volumes.xml
new file mode 100644
index 0000000..04e731d
--- /dev/null
+++ b/audio/panther/aidl_config/audio_policy_volumes.xml
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-4700
+ 33,-3500
+ 66,-2350
+ 100,-1250
+
+
+
+
+
+
+ 1,-3350
+ 33,-2100
+ 66,-1000
+ 100,0
+
+
+
+
+
+
+
+
+
+
+
+ 0,-4800
+ 33,-2050
+ 66,-800
+ 100,0
+
+
+
+
+
+
+ 1,-3800
+ 33,-2600
+ 66,-1400
+ 100,0
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-4700
+ 33,-3500
+ 66,-2350
+ 100,-1250
+
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-5500
+ 33,-3650
+ 66,-2700
+ 100,-1800
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml
new file mode 100644
index 0000000..894ef4e
--- /dev/null
+++ b/audio/panther/aidl_config/mixer_paths_aidl.xml
@@ -0,0 +1,862 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk
index e5e26fe..6a7619f 100644
--- a/audio/panther/audio-tables.mk
+++ b/audio/panther/audio-tables.mk
@@ -16,6 +16,18 @@
AUDIO_TABLE_FOLDER := panther
+# Enable this to build AIDL
+# BUILD_AUDIO_AIDL_VERSION := true
+
+ifeq ($(BUILD_AUDIO_AIDL_VERSION),true)
+# AIDL HAL configs are in the *aidl_config* folder
+PRODUCT_COPY_FILES += \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml
+else
+# HIDL HAL configs are in the *config* folder
# Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
@@ -34,6 +46,7 @@ PRODUCT_COPY_FILES += \
# Mixer Path Configuration for AudioHAL
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
+endif
# Speaker firmware files
SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw
@@ -44,6 +57,7 @@ PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*)
# Audio tuning
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \
+ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/smartfeature.gstf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/smartfeature.gstf \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index 84ee3a5..5522ce1 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -304,7 +304,7 @@
-
+
diff --git a/audio/panther/tuning/bluenote/smartfeature.gstf b/audio/panther/tuning/bluenote/smartfeature.gstf
new file mode 100644
index 0000000..d174ae3
Binary files /dev/null and b/audio/panther/tuning/bluenote/smartfeature.gstf differ
diff --git a/audio/ravenclaw/config/audio_platform_configuration.xml b/audio/ravenclaw/config/audio_platform_configuration.xml
index 2da5912..f91af55 100644
--- a/audio/ravenclaw/config/audio_platform_configuration.xml
+++ b/audio/ravenclaw/config/audio_platform_configuration.xml
@@ -295,7 +295,7 @@
-
+
diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml
index a836273..89d0de6 100644
--- a/bluetooth/le_audio_codec_capabilities.xml
+++ b/bluetooth/le_audio_codec_capabilities.xml
@@ -44,6 +44,8 @@
+
+
@@ -56,6 +58,8 @@
+
+
@@ -63,6 +67,7 @@
+
diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
deleted file mode 100644
index 64238c7..0000000
--- a/bluetooth/manifest_bluetooth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- android.hardware.bluetooth
- hwbinder
- 1.1
-
- IBluetoothHci
- default
-
-
-
- hardware.google.bluetooth.bt_channel_avoidance
- hwbinder
- 1.0
-
- IBTChannelAvoidance
- default
-
-
-
- hardware.google.bluetooth.sar
- hwbinder
- 1.1
-
- IBluetoothSar
- default
-
-
-
- hardware.google.bluetooth.ext
- hwbinder
- 1.0
-
- IBluetoothExt
- default
-
-
-
- hardware.google.bluetooth.ccc
- hwbinder
- 1.1
-
- IBluetoothCcc
- default
-
-
-
- hardware.google.bluetooth.ewp
- hwbinder
- 1.0
-
- IBluetoothEwp
- default
-
-
-
diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk
index 59a7b9b..5880d5b 100644
--- a/cheetah/BoardConfig.mk
+++ b/cheetah/BoardConfig.mk
@@ -13,6 +13,13 @@
# See the License for the specific language governing permissions and
# 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/pantah/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := cheetah
TARGET_SCREEN_DENSITY := 560
diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index bc57313..98d5c30 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -183,9 +183,6 @@
- 0.335
-
- 64
-
- 2
- 3
@@ -298,4 +295,17 @@
Note: This should be only enabled on devices with high confidence on power measurement.
-->
true
+
+
+ M 120.63086 0 C 111.97487 9.2518493e-17 103.41184 -0.00022182194 94.755859 0.091796875 C 86.099865 0.18380821 77.536566 0.46005475 68.972656 1.65625 C 51.568581 4.0486395 35.637425 10.122024 22.929688 22.912109 C 10.129864 35.610181 3.9606178 51.529084 1.5664062 68.919922 C 0.36930055 77.477315 0.092085137 86.034182 0 94.683594 L 0 3025.3164 C 0.092089816 3033.9658 0.3692987 3042.5227 1.5664062 3051.0801 C 3.9606216 3068.471 10.129872 3084.3898 22.929688 3097.0879 C 35.637432 3109.878 51.568582 3115.9514 68.972656 3118.3438 C 77.53656 3119.5398 86.099868 3119.8162 94.755859 3119.9082 C 103.41184 3120.0002 111.97487 3120 120.63086 3120 L 1319.3691 3120 C 1328.0252 3120 1336.5881 3120.0002 1345.2441 3119.9082 C 1353.9001 3119.8162 1362.4635 3119.5398 1371.0273 3118.3438 C 1388.4314 3115.9514 1404.3625 3109.878 1417.0703 3097.0879 C 1429.8701 3084.3898 1436.0412 3068.471 1438.4355 3051.0801 C 1439.6326 3042.5227 1439.9079 3033.9658 1440 3025.3164 L 1440 94.683594 C 1439.9079 86.03418 1439.6326 77.477314 1438.4355 68.919922 C 1436.0412 51.529083 1429.8701 35.610181 1417.0703 22.912109 C 1404.3625 10.122024 1388.4314 4.0486392 1371.0273 1.65625 C 1362.4635 0.4600554 1353.9001 0.18380669 1345.2441 0.091796875 C 1336.5881 -0.00022294096 1328.0251 0 1319.3691 0 L 120.63086 0 z
diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
new file mode 100644
index 0000000..9b3e461
--- /dev/null
+++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ Alarm
+
+
+ Wifi
+
+
+ Cellular_data
+
+
+ Sound_trigger
+
+
+ Sensor
+
+
+
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 4ce1f63..735cd9c 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -44,8 +44,5 @@
60px
-
-
- 0
diff --git a/cheetah/overlay/packages/apps/Nfc/res/values/config.xml b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml
index bb01504..0055264 100644
--- a/cheetah/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml
@@ -21,4 +21,15 @@
- GE2AE
- GFE4J
+ true
+
+ 75
+ 160
+ false
+
+ - 38
+
+
+ - 100
+
diff --git a/cheetah/rro_overlays/UwbOverlay/Android.bp b/cheetah/rro_overlays/UwbOverlay/Android.bp
new file mode 100644
index 0000000..a6156ea
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/Android.bp
@@ -0,0 +1,18 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "//device/google/pantah:device_google_pantah_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: [
+ "//device/google/pantah/cheetah:device_google_pantah_license",
+ ],
+}
+
+runtime_resource_overlay {
+ name: "UwbOverlayC10",
+ theme: "UwbOverlayC10",
+ certificate: "platform",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml b/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..57dfd5b
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/cheetah/rro_overlays/UwbOverlay/OWNERS b/cheetah/rro_overlays/UwbOverlay/OWNERS
new file mode 100644
index 0000000..2395d7f
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/OWNERS
@@ -0,0 +1,3 @@
+# People who can approve changes for submission
+include platform/packages/modules/Uwb:/OWNERS
+victorliu@google.com
diff --git a/cheetah/rro_overlays/UwbOverlay/res/values/config.xml b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml
new file mode 100644
index 0000000..0d69434
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml
@@ -0,0 +1,31 @@
+
+
+
+
+ true
+
+
+ false
+
+
+ true
+
diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
index b6f52e6..a0f0ac0 100644
--- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
@@ -56,6 +56,7 @@
true
+ true
true
@@ -150,4 +151,18 @@
true
+
+
+ true
+
+
+ true
+
+
+ true
diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc
index 8fe9268..dc2ff6c 100644
--- a/conf/init.cloudripper.rc
+++ b/conf/init.cloudripper.rc
@@ -15,7 +15,7 @@ on early-boot
wait_for_prop vendor.common.modules.ready 1
start insmod_sh_cloudripper
-service insmod_sh_cloudripper /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.cloudripper.cfg
+service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor/etc/init.insmod.cloudripper.cfg
class main
user root
group root system
@@ -51,3 +51,37 @@ on post-fs-data
setprop wifi.direct.interface p2p-dev-wlan0
setprop wifi.aware.interface aware_nmi0
+# Haptics
+on property:vendor.all.modules.ready=1
+ mkdir /mnt/vendor/persist/haptics 0770 system system
+ chmod 770 /mnt/vendor/persist/haptics
+ chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal
+ chmod 440 /mnt/vendor/persist/haptics/cs40l26_dual.cal
+ chown system system /mnt/vendor/persist/haptics
+ 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/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
+
+ enable vendor.vibrator.cs40l26
+ enable vendor.vibrator.cs40l26-dual
diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index 48abe65..54dbb2e 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -13,7 +13,7 @@ on early-boot
wait_for_prop vendor.common.modules.ready 1
start insmod_sh_pantah
-service insmod_sh_pantah /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_pantah /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
class main
user root
group root system
@@ -24,24 +24,6 @@ on property:vendor.mfgapi.touchpanel.permission=1
chmod 0600 /sys/devices/virtual/sec/tsp/cmd
chown system system /sys/devices/virtual/sec/tsp/cmd
-# Fingerprint
-on post-fs-data
- chown system system /dev/goodix_fp
- exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app
-
-# Overrides fingerprint antispoof if following persist sysprops are set
-on boot && property:ro.build.type=userdebug && \
- property:persist.vendor.fingerprint.disable.fake.override=0
- setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}
-
-on boot && property:ro.build.type=userdebug && \
- property:persist.vendor.fingerprint.disable.fake.override=1
- setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}
-
-on boot && property:ro.build.type=userdebug && \
- property:persist.vendor.fingerprint.disable.fake.override=100
- setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}
-
# WiFi
on post-fs-data
setprop wifi.direct.interface p2p-dev-wlan0
@@ -87,31 +69,23 @@ on property:ro.boot.hardware.revision=PROTO1.0
on property:ro.boot.hardware.revision=PROTO1.1
setprop vendor.thermal.config "thermal_info_config_proto.json"
-# Touch
-on property:vendor.device.modules.ready=1
- chown system system /proc/focaltech_touch/Channel_Num
- chown system system /proc/focaltech_touch/FW_Version
- chown system system /proc/focaltech_touch/INT_PIN
- chown system system /proc/focaltech_touch/force_active
- chown system system /proc/focaltech_touch/Reset_Pin
- chown system system /proc/focaltech_touch/fw_grip
- chown system system /proc/focaltech_touch/fw_palm
- chown system system /proc/focaltech_touch/heatmap_onoff
- chown system system /proc/focaltech_touch/mf_mode
- chown system system /proc/focaltech_touch/selftest/Baseline
- chown system system /proc/focaltech_touch/selftest/Noise
- chown system system /proc/focaltech_touch/selftest/Panel_Differ
- chown system system /proc/focaltech_touch/selftest/Rawdata
- chown system system /proc/focaltech_touch/selftest/Rawdata_Uniformity
- chown system system /proc/focaltech_touch/selftest/Scap_CB
- chown system system /proc/focaltech_touch/selftest/Scap_Rawdata
- chown system system /proc/focaltech_touch/selftest/Short
- chown system system /proc/focaltech_touch/selftest/Strength
+# Haptics
+on property:vendor.all.modules.ready=1
+ mkdir /mnt/vendor/persist/haptics 0770 system system
+ chmod 770 /mnt/vendor/persist/haptics
+ chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal
+ chown system system /mnt/vendor/persist/haptics
+ chown system system /mnt/vendor/persist/haptics/cs40l26.cal
-# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints
-on property:sys.boot_completed=1
- trigger override-sf-uclamp
+ 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
-on override-sf-uclamp
- write /proc/vendor_sched/rt_uclamp_min 0
- write /proc/vendor_sched/sf_uclamp_min 0
+ enable vendor.vibrator.cs40l26
diff --git a/conf/init.panther.rc b/conf/init.panther.rc
index d786cf3..2e78ee9 100644
--- a/conf/init.panther.rc
+++ b/conf/init.panther.rc
@@ -6,13 +6,6 @@ on property:vendor.device.modules.ready=1
# Start the twoshay touch service
start twoshay
-# Toggle glove_mode according to touch_sensitivity_mode
-on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
- write /proc/focaltech_touch/high_sensitivity 0
-
-on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1
- write /proc/focaltech_touch/high_sensitivity 1
-
# For Japan sku, always enforce camera shutter sound
# Since this property is read by the audio server in system service,
# it should be written by the system init.
diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc
index 70bae17..0482aa6 100644
--- a/conf/init.ravenclaw.rc
+++ b/conf/init.ravenclaw.rc
@@ -15,7 +15,7 @@ on early-boot
wait_for_prop vendor.common.modules.ready 1
start insmod_sh_ravenclaw
-service insmod_sh_ravenclaw /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg
+service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg
class main
user root
group root system
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 8843e28..4e5623f 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -29,9 +29,9 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay
include device/google/pantah/audio/cheetah/audio-tables.mk
include device/google/gs201/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
+include device/google/gs-common/touch/syna/syna.mk
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),)
include device/google/pantah/uwb/uwb_calibration.mk
endif
@@ -144,13 +144,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/powerhint-cheetah-a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-a0.json
# Bluetooth HAL
-DEVICE_MANIFEST_FILE += \
- device/google/pantah/bluetooth/manifest_bluetooth.xml
-PRODUCT_SOONG_NAMESPACES += \
- vendor/broadcom/bluetooth
-PRODUCT_PACKAGES += \
- android.hardware.bluetooth@1.1-service.bcmbtlinux \
- bt_vendor.conf
PRODUCT_COPY_FILES += \
device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
PRODUCT_PROPERTY_OVERRIDES += \
@@ -158,10 +151,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.bluetooth.a2dp_offload.disabled=false \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
-# Spatial Audio
-PRODUCT_PACKAGES += \
- libspatialaudio
-
# Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \
hci_inject
@@ -184,6 +173,55 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES_DEBUG += \
sar_test
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.firmware.selection=BCM.hcd
+
+# Bluetooth AAC VBR
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.a2dp_aac.vbr_supported=true
+
+# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.bqr.event_mask=262238
+else
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.bqr.event_mask=94
+endif
+
+# Bluetooth LE Audio
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.bluetooth.leaudio_offload.supported=true \
+ persist.bluetooth.leaudio_offload.disabled=false \
+ ro.bluetooth.leaudio_switcher.supported=true \
+ bluetooth.profile.bap.unicast.client.enabled?=true \
+ bluetooth.profile.csip.set_coordinator.enabled?=true \
+ bluetooth.profile.hap.client.enabled?=true \
+ bluetooth.profile.mcp.server.enabled?=true \
+ bluetooth.profile.ccp.server.enabled?=true \
+ bluetooth.profile.vcp.controller.enabled?=true \
+
+# Bluetooth LE Audio CIS handover to SCO
+# Set the property only if the controller doesn't support CIS and SCO
+# simultaneously. More details in b/242908683.
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.leaudio.notify.idle.during.call=true
+
+# LE Auido Offload Capabilities setting
+PRODUCT_COPY_FILES += \
+ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
+
+# Bluetooth EWP test tool
+PRODUCT_PACKAGES_DEBUG += \
+ ewp_tool
+# default BDADDR for EVB only
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
+
+# Spatial Audio
+PRODUCT_PACKAGES += \
+ libspatialaudio
+
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
@@ -222,10 +260,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# ro.hardware.keystore=software \
# ro.hardware.gatekeeper=software
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
# PowerStats HAL
PRODUCT_SOONG_NAMESPACES += \
device/google/pantah/powerstats/cheetah \
@@ -240,8 +274,8 @@ else
include device/google/gs101/fingerprint/udfps_factory.mk
endif
-# WiFi Overlay
PRODUCT_PACKAGES += \
+ UwbOverlayC10 \
WifiOverlay2022_C10
PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
@@ -272,11 +306,12 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=23
+ ro.vendor.build.svn=31
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
- ro.gms.dck.eligible_wcc=3
+ ro.gms.dck.eligible_wcc=3 \
+ ro.gms.dck.se_capability=1
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -292,20 +327,6 @@ PRODUCT_PACKAGES += \
SettingsOverlayGE2AE \
SettingsOverlayGP4BC
-# Bluetooth LE Audio
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.bluetooth.leaudio_offload.supported=true \
- persist.bluetooth.leaudio_offload.disabled=false \
- ro.bluetooth.leaudio_switcher.supported=true
-
-# LE Auido Offload Capabilities setting
-PRODUCT_COPY_FILES += \
- device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
-
-# Bluetooth EWP test tool
-PRODUCT_PACKAGES_DEBUG += \
- ewp_tool
-
# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
@@ -318,24 +339,11 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
# Vibrator HAL
+ACTUATOR_MODEL := luxshare_ict_081545
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.vibrator.hal.chirp.enabled=1
-
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.firmware.selection=BCM.hcd
-
-# Bluetooth AAC VBR
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.a2dp_aac.vbr_supported=true
-
-# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.bqr.event_mask=262238
-else
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.bqr.event_mask=94
-endif
+ ro.vendor.vibrator.hal.chirp.enabled=0 \
+ ro.vendor.vibrator.hal.device.mass=0.214 \
+ ro.vendor.vibrator.hal.loc.coeff=2.7
# Keyboard bottom and side padding in dp for portrait mode and height ratio
PRODUCT_PRODUCT_PROPERTIES += \
@@ -366,7 +374,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Device features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
-
-# Enable adpf cpu hint session for SurfaceFlinger
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- debug.sf.enable_adpf_cpu_hint=true
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 1b63578..0a4dfc1 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -25,9 +25,10 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud
include device/google/gs201/device-shipping-common.mk
include device/google/pantah/audio/cloudripper/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
+include device/google/gs-common/gps/brcm/cbd_gps.mk
+include device/google/gs-common/touch/syna/syna.mk
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,cloudripper)
$(call soong_config_set,lyric,tuning_product,cloudripper)
@@ -96,19 +97,19 @@ PRODUCT_COPY_FILES += \
device/google/pantah/powerhint-cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
# Bluetooth HAL
-DEVICE_MANIFEST_FILE += \
- device/google/pantah/bluetooth/manifest_bluetooth.xml
-PRODUCT_SOONG_NAMESPACES += \
- vendor/broadcom/bluetooth
-PRODUCT_PACKAGES += \
- android.hardware.bluetooth@1.1-service.bcmbtlinux \
- bt_vendor.conf
PRODUCT_COPY_FILES += \
device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
+
PRODUCT_PROPERTY_OVERRIDES += \
ro.bluetooth.a2dp_offload.supported=true \
persist.bluetooth.a2dp_offload.disabled=false \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.firmware.selection=BCM.hcd
+
+# default BDADDR for EVB only
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
# Spatial Audio
PRODUCT_PACKAGES += \
@@ -145,10 +146,6 @@ PRODUCT_PACKAGES += \
# ro.hardware.keystore=software \
# ro.hardware.gatekeeper=software
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
# PowerStats HAL
PRODUCT_SOONG_NAMESPACES += \
device/google/pantah/powerstats/cloudripper
@@ -185,9 +182,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.firmware.selection=BCM.hcd
-
# Device features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
diff --git a/device-panther.mk b/device-panther.mk
index 2f14489..dde9314 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -29,9 +29,9 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay
include device/google/pantah/audio/panther/audio-tables.mk
include device/google/gs201/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
+include device/google/gs-common/touch/focaltech/focaltech.mk
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,panther)
$(call soong_config_set,lyric,tuning_product,panther)
@@ -124,14 +124,11 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/google/pantah/powerhint-panther-a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-a0.json
-# Bluetooth HAL
-DEVICE_MANIFEST_FILE += \
- device/google/pantah/bluetooth/manifest_bluetooth.xml
-PRODUCT_SOONG_NAMESPACES += \
- vendor/broadcom/bluetooth
+# Spatial Audio
PRODUCT_PACKAGES += \
- android.hardware.bluetooth@1.1-service.bcmbtlinux \
- bt_vendor.conf
+ libspatialaudio
+
+# Bluetooth HAL
PRODUCT_COPY_FILES += \
device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
PRODUCT_PROPERTY_OVERRIDES += \
@@ -139,10 +136,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.bluetooth.a2dp_offload.disabled=false \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
-# Spatial Audio
-PRODUCT_PACKAGES += \
- libspatialaudio
-
# Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \
hci_inject
@@ -164,6 +157,51 @@ PRODUCT_COPY_FILES += \
# Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \
sar_test
+# default BDADDR for EVB only
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
+
+# Bluetooth LE Audio
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.bluetooth.leaudio_offload.supported=true \
+ persist.bluetooth.leaudio_offload.disabled=false \
+ ro.bluetooth.leaudio_switcher.supported=true \
+ bluetooth.profile.bap.unicast.client.enabled?=true \
+ bluetooth.profile.csip.set_coordinator.enabled?=true \
+ bluetooth.profile.hap.client.enabled?=true \
+ bluetooth.profile.mcp.server.enabled?=true \
+ bluetooth.profile.ccp.server.enabled?=true \
+ bluetooth.profile.vcp.controller.enabled?=true \
+
+# Bluetooth LE Audio CIS handover to SCO
+# Set the property only if the controller doesn't support CIS and SCO
+# simultaneously. More details in b/242908683.
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.leaudio.notify.idle.during.call=true
+
+# LE Auido Offload Capabilities setting
+PRODUCT_COPY_FILES += \
+ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
+
+# Bluetooth EWP test tool
+PRODUCT_PACKAGES_DEBUG += \
+ ewp_tool
+
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.firmware.selection=BCM.hcd
+
+# Bluetooth AAC VBR
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.a2dp_aac.vbr_supported=true
+
+# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.bqr.event_mask=262238
+else
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.bqr.event_mask=94
+endif
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
@@ -203,10 +241,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# ro.hardware.keystore=software \
# ro.hardware.gatekeeper=software
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
# PowerStats HAL
PRODUCT_SOONG_NAMESPACES += \
device/google/pantah/powerstats/panther \
@@ -257,11 +291,13 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=23
+ ro.vendor.build.svn=31
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
- ro.gms.dck.eligible_wcc=2
+ ro.gms.dck.eligible_wcc=2 \
+ ro.gms.dck.se_capability=1
+
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -278,20 +314,6 @@ PRODUCT_PACKAGES += \
SettingsOverlayGVU6C \
SettingsOverlayGVU6C_VN
-# Bluetooth LE Audio
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.bluetooth.leaudio_offload.supported=true \
- persist.bluetooth.leaudio_offload.disabled=false \
- ro.bluetooth.leaudio_switcher.supported=true
-
-# LE Auido Offload Capabilities setting
-PRODUCT_COPY_FILES += \
- device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
-
-# Bluetooth EWP test tool
-PRODUCT_PACKAGES_DEBUG += \
- ewp_tool
-
# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
@@ -304,25 +326,11 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
# Vibrator HAL
+ACTUATOR_MODEL := luxshare_ict_081545
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.vibrator.hal.chirp.enabled=1
-
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.firmware.selection=BCM.hcd
-
-# Bluetooth AAC VBR
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.a2dp_aac.vbr_supported=true
-
-# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.bqr.event_mask=262238
-else
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.bqr.event_mask=94
-endif
-
+ ro.vendor.vibrator.hal.chirp.enabled=0 \
+ ro.vendor.vibrator.hal.device.mass=0.195 \
+ ro.vendor.vibrator.hal.loc.coeff=2.65
# Keyboard bottom padding in dp for portrait mode and height ratio
PRODUCT_PRODUCT_PROPERTIES += \
ro.com.google.ime.kb_pad_port_b=8 \
@@ -350,7 +358,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Device features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
-
-# Enable adpf cpu hint session for SurfaceFlinger
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- debug.sf.enable_adpf_cpu_hint=true
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index f8ef6dc..b3607e7 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -25,9 +25,9 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven
include device/google/gs201/device-shipping-common.mk
include device/google/pantah/audio/ravenclaw/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
+include device/google/gs-common/touch/lsi/lsi.mk
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),)
include device/google/gs101/uwb/uwb.mk
include device/google/pantah/uwb/uwb_calibration.mk
@@ -94,19 +94,17 @@ PRODUCT_COPY_FILES += \
device/google/pantah/powerhint-ravenclaw.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
# Bluetooth HAL
-DEVICE_MANIFEST_FILE += \
- device/google/pantah/bluetooth/manifest_bluetooth.xml
-PRODUCT_SOONG_NAMESPACES += \
- vendor/broadcom/bluetooth
-PRODUCT_PACKAGES += \
- android.hardware.bluetooth@1.1-service.bcmbtlinux \
- bt_vendor.conf
PRODUCT_COPY_FILES += \
device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
PRODUCT_PROPERTY_OVERRIDES += \
ro.bluetooth.a2dp_offload.supported=true \
persist.bluetooth.a2dp_offload.disabled=false \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
+PRODUCT_PRODUCT_PROPERTIES += \
+ persist.bluetooth.firmware.selection=BCM.hcd
+# default BDADDR for EVB only
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
# Keymaster HAL
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
@@ -138,10 +136,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# ro.hardware.keystore=software \
# ro.hardware.gatekeeper=software
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
# PowerStats HAL
PRODUCT_SOONG_NAMESPACES += \
device/google/pantah/powerstats/ravenclaw
@@ -182,9 +176,6 @@ endif
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g
-PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.firmware.selection=BCM.hcd
-
# Device features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
deleted file mode 100644
index 26436bb..0000000
--- a/device_framework_matrix_product.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- hardware.google.bluetooth.ccc
- 1.1
-
- IBluetoothCcc
- default
-
-
-
diff --git a/init.insmod.cheetah.cfg b/init.insmod.cheetah.cfg
index 7487e1e..5a38650 100644
--- a/init.insmod.cheetah.cfg
+++ b/init.insmod.cheetah.cfg
@@ -9,8 +9,7 @@
modprobe|bcmdhd4389.ko
modprobe|snd-soc-cs35l41-spi.ko
modprobe|syna_touch.ko
-modprobe|cl_dsp.ko
-modprobe|input-cs40l26-i2c.ko
+modprobe|cs40l26-i2c.ko
modprobe|snd-soc-cs40l26.ko
# All device specific modules loaded
diff --git a/init.insmod.cloudripper.cfg b/init.insmod.cloudripper.cfg
index 4d6ab6f..aa7bab4 100644
--- a/init.insmod.cloudripper.cfg
+++ b/init.insmod.cloudripper.cfg
@@ -10,8 +10,7 @@ modprobe|bcmdhd4389.ko
modprobe|snd-soc-cs35l41-i2c.ko
modprobe|ftm5.ko
modprobe|sec_touch.ko
-modprobe|cl_dsp.ko
-modprobe|input-cs40l26-i2c.ko
+modprobe|cs40l26-i2c.ko
modprobe|snd-soc-cs40l26.ko
# All device specific modules loaded
diff --git a/init.insmod.panther.cfg b/init.insmod.panther.cfg
index c82a69e..1a07eff 100644
--- a/init.insmod.panther.cfg
+++ b/init.insmod.panther.cfg
@@ -9,8 +9,7 @@
modprobe|bcmdhd4389.ko
modprobe|snd-soc-cs35l41-spi.ko
modprobe|focal_touch.ko
-modprobe|cl_dsp.ko
-modprobe|input-cs40l26-i2c.ko
+modprobe|cs40l26-i2c.ko
modprobe|snd-soc-cs40l26.ko
# All device specific modules loaded
diff --git a/location/gps.xml b/location/gps.xml
index f43535b..77fec48 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,7 +35,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
- SuplOtdoaCapable2="true"
+ SuplOtdoaCapable2="false"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
@@ -88,6 +88,7 @@
EnableOnChipStopNotification="2"
PowerMode="3"
MinGpsWeekNumber="2216"
+ OnChipAccMask="50"
/>
- 0.335
-
- 64
-
- 2
- 3
@@ -315,4 +312,17 @@
Note: This should be only enabled on devices with high confidence on power measurement.
-->
true
+
+
+ M 75.769531 0 C 70.332709 -9.2518493e-18 64.952449 0.00079919532 59.515625 0.05859375 C 54.078801 0.11638831 48.699297 0.28968642 43.320312 1.0410156 C 32.388827 2.5436742 22.384063 6.3571816 14.402344 14.390625 C 6.3627864 22.366274 2.486224 32.36589 0.98242188 43.289062 C 0.23052083 48.663956 0.057838542 54.038015 0 59.470703 L 0 2340.5293 C 0.057838884 2345.962 0.23052038 2351.336 0.98242188 2356.7109 C 2.4862239 2367.6341 6.3627861 2377.6338 14.402344 2385.6094 C 22.384063 2393.6429 32.388834 2397.4563 43.320312 2398.959 C 48.699302 2399.7103 54.078805 2399.8834 59.515625 2399.9414 C 64.952444 2399.9994 70.332714 2400 75.769531 2400 L 1004.2305 2400 C 1009.6673 2400 1015.0476 2399.9994 1020.4844 2399.9414 C 1025.9213 2399.8834 1031.3008 2399.7103 1036.6797 2398.959 C 1047.6113 2397.4563 1057.6159 2393.6429 1065.5977 2385.6094 C 1073.6371 2377.6338 1077.5138 2367.6341 1079.0176 2356.7109 C 1079.7695 2351.336 1079.9422 2345.962 1080 2340.5293 L 1080 59.470703 C 1079.9422 54.038015 1079.7695 48.663956 1079.0176 43.289062 C 1077.5138 32.36589 1073.637 22.366274 1065.5977 14.390625 C 1057.6159 6.3571811 1047.6112 2.5436742 1036.6797 1.0410156 C 1031.3007 0.28968666 1025.9213 0.11639363 1020.4844 0.05859375 C 1015.0476 0.00080386558 1009.6673 0 1004.2305 0 L 75.769531 0 z
diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
new file mode 100644
index 0000000..9b3e461
--- /dev/null
+++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ Alarm
+
+
+ Wifi
+
+
+ Cellular_data
+
+
+ Sound_trigger
+
+
+ Sensor
+
+
+
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 ff76828..bbb6ac3 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -49,10 +49,6 @@
48px
-
- 0
-
16px
diff --git a/panther/overlay/packages/apps/Nfc/res/values/config.xml b/panther/overlay/packages/apps/Nfc/res/values/config.xml
index 551d19e..d5bfd3d 100644
--- a/panther/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/panther/overlay/packages/apps/Nfc/res/values/config.xml
@@ -21,4 +21,15 @@
- GVU6C
- G03Z5
+ true
+
+ 70
+ 150
+ false
+
+ - 38
+
+
+ - 97
+
diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml
index dac7453..daa6e49 100644
--- a/panther/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml
@@ -59,6 +59,7 @@
true
+ true
true
@@ -151,4 +152,17 @@
true
+
+ true
+
+
+ true
+
+
+ true
diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 7a37158..665c384 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -137,6 +137,16 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
+ {
+ "Name": "CPUDVFSHeadroom",
+ "Path": "/proc/vendor_sched/dvfs_headroom",
+ "Values": [
+ "1280",
+ "1100"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -151,7 +161,7 @@
"Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min",
"Values": [
- "612",
+ "765",
"0"
],
"ResetOnInit": true
@@ -160,9 +170,9 @@
"Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
- "612",
+ "765",
"1",
- "63"
+ "79"
],
"ResetOnInit": true
},
@@ -179,8 +189,8 @@
"Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min",
"Values": [
- "180",
- "650"
+ "225",
+ "813"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -662,7 +672,7 @@
"PowerHint": "LAUNCH",
"Node": "TAUClampBoost",
"Duration": 5000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "LAUNCH",
@@ -717,6 +727,12 @@
"Duration": 3000,
"Value": "0"
},
+ {
+ "PowerHint": "CPU_LOAD_RESET",
+ "Node": "MemFreq",
+ "Duration": 33,
+ "Value": "1014000"
+ },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@@ -763,7 +779,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CAMUClampBoost",
"Duration": 1000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "CAMERA_LAUNCH",
@@ -1257,6 +1273,12 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1100"
+ },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferHighCap",
@@ -1665,13 +1687,13 @@
"PowerHint": "REFRESH_120FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "63"
+ "Value": "79"
},
{
"PowerHint": "REFRESH_60FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "63"
+ "Value": "79"
},
{
"PowerHint": "ADPF_DISABLE_TA_BOOST",
@@ -1958,7 +1980,7 @@
"PowerHint": "ML_ACC",
"Node": "MLUclampBoost",
"Duration": 2000,
- "Value": "650"
+ "Value": "813"
},
{
"PowerHint": "ML_ACC",
@@ -1980,8 +2002,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 185,
- "UclampMin_High": 384,
+ "UclampMin_Init": 232,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2004,8 +2026,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2028,8 +2050,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2055,9 +2077,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 157,
- "UclampMin_Low": 157,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 197,
+ "UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -2079,9 +2101,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 42,
- "UclampMin_Low": 42,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 53,
+ "UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -2103,7 +2125,7 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
+ "UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 66d3593..090e924 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -1,5 +1,18 @@
{
"Nodes": [
+ {
+ "Name": "GPUMinFreq",
+ "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
+ "Values": [
+ "848000",
+ "762000",
+ "572000",
+ "471000",
+ "302000",
+ "202000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "MemFreq",
"Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq",
@@ -114,19 +127,6 @@
],
"ResetOnInit": true
},
- {
- "Name": "GPUMinFreq",
- "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
- "Values": [
- "848000",
- "762000",
- "572000",
- "471000",
- "302000",
- "202000"
- ],
- "ResetOnInit": true
- },
{
"Name": "GPUDvfsPeriod",
"Path": "/sys/devices/platform/28000000.mali/dvfs_period",
@@ -155,6 +155,16 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
+ {
+ "Name": "CPUDVFSHeadroom",
+ "Path": "/proc/vendor_sched/dvfs_headroom",
+ "Values": [
+ "1280",
+ "1100"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -169,7 +179,7 @@
"Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min",
"Values": [
- "612",
+ "765",
"0"
],
"ResetOnInit": true
@@ -178,7 +188,7 @@
"Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
- "612",
+ "765",
"1"
],
"ResetOnInit": true
@@ -196,8 +206,8 @@
"Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min",
"Values": [
- "180",
- "650"
+ "225",
+ "813"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -626,6 +636,16 @@
"0,1,2,3,4,5,6,7"
],
"Type": "Property"
+ },
+ {
+ "Name": "Dex2oatGroup",
+ "Path": "/proc/vendor_sched/dex2oat_ug",
+ "Values": [
+ "1",
+ "0"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
}
],
"Actions": [
@@ -698,7 +718,7 @@
"PowerHint": "LAUNCH",
"Node": "TAUClampBoost",
"Duration": 5000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "LAUNCH",
@@ -776,6 +796,18 @@
"Duration": 3000,
"Value": "0"
},
+ {
+ "PowerHint": "CPU_LOAD_RESET",
+ "Node": "GPUMinFreq",
+ "Duration": 50,
+ "Value": "302000"
+ },
+ {
+ "PowerHint": "CPU_LOAD_RESET",
+ "Node": "MemFreq",
+ "Duration": 33,
+ "Value": "1014000"
+ },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@@ -822,7 +854,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CAMUClampBoost",
"Duration": 1000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "CAMERA_LAUNCH",
@@ -1316,6 +1348,12 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1100"
+ },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferHighCap",
@@ -1720,6 +1758,78 @@
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "BigControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "MidControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "LittleControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "G3dControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "TpuControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "AurControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "BigSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "MidSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "LittleSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "G3dSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "TpuSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "AurSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
{
"PowerHint": "REFRESH_120FPS",
"Node": "TAUClampBoost",
@@ -1785,12 +1895,6 @@
"Duration": 0,
"Value": "572000"
},
- {
- "PowerHint": "ADPF_FIRST_FRAME",
- "Node": "GPUMinFreq",
- "Duration": 50,
- "Value": "302000"
- },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "PMU_POLL",
@@ -1881,6 +1985,12 @@
"Duration": 0,
"Value": "0,1,2,3,4,5"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "PMU_POLL",
@@ -1971,6 +2081,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "PMU_POLL",
@@ -2061,6 +2177,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "PMU_POLL",
@@ -2151,6 +2273,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "PMU_POLL",
@@ -2259,6 +2387,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPUBigClusterMaxFreq",
@@ -2329,7 +2463,7 @@
"PowerHint": "ML_ACC",
"Node": "MLUclampBoost",
"Duration": 2000,
- "Value": "650"
+ "Value": "813"
},
{
"PowerHint": "ML_ACC",
@@ -2351,8 +2485,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 185,
- "UclampMin_High": 384,
+ "UclampMin_Init": 232,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2375,8 +2509,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2399,8 +2533,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2426,9 +2560,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 157,
- "UclampMin_Low": 157,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 197,
+ "UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -2450,9 +2584,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 42,
- "UclampMin_Low": 42,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 53,
+ "UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -2474,7 +2608,7 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
+ "UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json
index 8991299..68d5c41 100644
--- a/powerhint-cloudripper.json
+++ b/powerhint-cloudripper.json
@@ -109,6 +109,16 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
+ {
+ "Name": "CPUDVFSHeadroom",
+ "Path": "/proc/vendor_sched/dvfs_headroom",
+ "Values": [
+ "1280",
+ "1100"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -123,11 +133,11 @@
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
"0",
- "553",
- "246",
- "185",
- "123",
- "62"
+ "692",
+ "308",
+ "232",
+ "154",
+ "78"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -320,19 +330,19 @@
"PowerHint": "INTERACTION_120",
"Node": "TAUClampBoost",
"Duration": 6000,
- "Value": "246"
+ "Value": "308"
},
{
"PowerHint": "INTERACTION_90",
"Node": "TAUClampBoost",
"Duration": 6000,
- "Value": "185"
+ "Value": "232"
},
{
"PowerHint": "INTERACTION_60",
"Node": "TAUClampBoost",
"Duration": 6000,
- "Value": "123"
+ "Value": "154"
},
{
"PowerHint": "REFRESH_120FPS",
@@ -406,7 +416,7 @@
"PowerHint": "LAUNCH",
"Node": "TAUClampBoost",
"Duration": 5000,
- "Value": "553"
+ "Value": "692"
},
{
"PowerHint": "LAUNCH",
@@ -744,6 +754,12 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1100"
+ },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUMidClusterMaxFreq",
@@ -1006,19 +1022,19 @@
"PowerHint": "REFRESH_120FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "185"
+ "Value": "232"
},
{
"PowerHint": "REFRESH_90FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "123"
+ "Value": "154"
},
{
"PowerHint": "REFRESH_60FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "62"
+ "Value": "78"
},
{
"PowerHint": "DISABLE_TA_BOOST",
@@ -1102,8 +1118,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 185,
- "UclampMin_High": 384,
+ "UclampMin_Init": 232,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1126,8 +1142,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1150,8 +1166,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1177,9 +1193,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 157,
- "UclampMin_Low": 157,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 197,
+ "UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1201,9 +1217,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 42,
- "UclampMin_Low": 42,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 53,
+ "UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1225,7 +1241,7 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
+ "UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index c638dd5..478619f 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -126,6 +126,16 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
+ {
+ "Name": "CPUDVFSHeadroom",
+ "Path": "/proc/vendor_sched/dvfs_headroom",
+ "Values": [
+ "1280",
+ "1100"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -140,7 +150,7 @@
"Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min",
"Values": [
- "612",
+ "765",
"0"
],
"ResetOnInit": true
@@ -149,9 +159,9 @@
"Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
- "612",
+ "765",
"1",
- "63"
+ "79"
],
"ResetOnInit": true
},
@@ -168,8 +178,8 @@
"Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min",
"Values": [
- "180",
- "650"
+ "225",
+ "813"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -651,7 +661,7 @@
"PowerHint": "LAUNCH",
"Node": "TAUClampBoost",
"Duration": 5000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "LAUNCH",
@@ -706,6 +716,12 @@
"Duration": 3000,
"Value": "0"
},
+ {
+ "PowerHint": "CPU_LOAD_RESET",
+ "Node": "MemFreq",
+ "Duration": 33,
+ "Value": "1014000"
+ },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@@ -752,7 +768,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CAMUClampBoost",
"Duration": 1000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "CAMERA_LAUNCH",
@@ -1144,6 +1160,12 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1100"
+ },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferHighCap",
@@ -1552,13 +1574,13 @@
"PowerHint": "REFRESH_90FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "63"
+ "Value": "79"
},
{
"PowerHint": "REFRESH_60FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "63"
+ "Value": "79"
},
{
"PowerHint": "ADPF_DISABLE_TA_BOOST",
@@ -1845,7 +1867,7 @@
"PowerHint": "ML_ACC",
"Node": "MLUclampBoost",
"Duration": 2000,
- "Value": "650"
+ "Value": "813"
},
{
"PowerHint": "ML_ACC",
@@ -1867,8 +1889,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 185,
- "UclampMin_High": 384,
+ "UclampMin_Init": 232,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1891,8 +1913,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1915,8 +1937,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1942,9 +1964,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 157,
- "UclampMin_Low": 157,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 197,
+ "UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1966,9 +1988,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 42,
- "UclampMin_Low": 42,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 53,
+ "UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1990,7 +2012,7 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
+ "UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
diff --git a/powerhint-panther.json b/powerhint-panther.json
index 93362fa..d32ef83 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -1,5 +1,18 @@
{
"Nodes": [
+ {
+ "Name": "GPUMinFreq",
+ "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
+ "Values": [
+ "848000",
+ "762000",
+ "572000",
+ "471000",
+ "302000",
+ "202000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "MemFreq",
"Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq",
@@ -103,19 +116,6 @@
],
"ResetOnInit": true
},
- {
- "Name": "GPUMinFreq",
- "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
- "Values": [
- "848000",
- "762000",
- "572000",
- "471000",
- "302000",
- "202000"
- ],
- "ResetOnInit": true
- },
{
"Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -135,6 +135,16 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
+ {
+ "Name": "CPUDVFSHeadroom",
+ "Path": "/proc/vendor_sched/dvfs_headroom",
+ "Values": [
+ "1280",
+ "1100"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -149,7 +159,7 @@
"Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min",
"Values": [
- "612",
+ "765",
"0"
],
"ResetOnInit": true
@@ -158,7 +168,7 @@
"Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
- "612",
+ "765",
"1"
],
"ResetOnInit": true
@@ -176,8 +186,8 @@
"Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min",
"Values": [
- "180",
- "650"
+ "225",
+ "813"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -606,6 +616,16 @@
"0,1,2,3,4,5,6,7"
],
"Type": "Property"
+ },
+ {
+ "Name": "Dex2oatGroup",
+ "Path": "/proc/vendor_sched/dex2oat_ug",
+ "Values": [
+ "1",
+ "0"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
}
],
"Actions": [
@@ -667,7 +687,7 @@
"PowerHint": "LAUNCH",
"Node": "TAUClampBoost",
"Duration": 5000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "LAUNCH",
@@ -745,6 +765,18 @@
"Duration": 3000,
"Value": "0"
},
+ {
+ "PowerHint": "CPU_LOAD_RESET",
+ "Node": "GPUMinFreq",
+ "Duration": 50,
+ "Value": "302000"
+ },
+ {
+ "PowerHint": "CPU_LOAD_RESET",
+ "Node": "MemFreq",
+ "Duration": 33,
+ "Value": "1014000"
+ },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@@ -791,7 +823,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CAMUClampBoost",
"Duration": 1000,
- "Value": "612"
+ "Value": "765"
},
{
"PowerHint": "CAMERA_LAUNCH",
@@ -1183,6 +1215,12 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1100"
+ },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferHighCap",
@@ -1587,6 +1625,78 @@
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "BigControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "MidControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "LittleControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "G3dControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "TpuControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "AurControlTempSet",
+ "Duration": 0,
+ "Value": "80000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "BigSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "MidSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "LittleSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "G3dSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "TpuSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
+ {
+ "PowerHint": "LOW_POWER",
+ "Node": "AurSwitchOnTempSet",
+ "Duration": 0,
+ "Value": "60000"
+ },
{
"PowerHint": "REFRESH_90FPS",
"Node": "TAUClampBoost",
@@ -1652,12 +1762,6 @@
"Duration": 0,
"Value": "572000"
},
- {
- "PowerHint": "ADPF_FIRST_FRAME",
- "Node": "GPUMinFreq",
- "Duration": 50,
- "Value": "302000"
- },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "PMU_POLL",
@@ -1748,6 +1852,12 @@
"Duration": 0,
"Value": "0,1,2,3,4,5"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "PMU_POLL",
@@ -1838,6 +1948,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "PMU_POLL",
@@ -1928,6 +2044,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "PMU_POLL",
@@ -2018,6 +2140,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "PMU_POLL",
@@ -2126,6 +2254,12 @@
"Duration": 0,
"Value": "0,1,2,3"
},
+ {
+ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+ "Node": "Dex2oatGroup",
+ "Duration": 0,
+ "Value": "0"
+ },
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPUBigClusterMaxFreq",
@@ -2196,7 +2330,7 @@
"PowerHint": "ML_ACC",
"Node": "MLUclampBoost",
"Duration": 2000,
- "Value": "650"
+ "Value": "813"
},
{
"PowerHint": "ML_ACC",
@@ -2218,8 +2352,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 185,
- "UclampMin_High": 384,
+ "UclampMin_Init": 232,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2242,8 +2376,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2266,8 +2400,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -2293,9 +2427,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 157,
- "UclampMin_Low": 157,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 197,
+ "UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -2317,9 +2451,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 42,
- "UclampMin_Low": 42,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 53,
+ "UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -2341,7 +2475,7 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
+ "UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json
index 0b3c4c5..d1148b1 100644
--- a/powerhint-ravenclaw.json
+++ b/powerhint-ravenclaw.json
@@ -109,6 +109,16 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
+ {
+ "Name": "CPUDVFSHeadroom",
+ "Path": "/proc/vendor_sched/dvfs_headroom",
+ "Values": [
+ "1280",
+ "1100"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -123,11 +133,11 @@
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
"0",
- "553",
- "246",
- "185",
- "123",
- "62"
+ "692",
+ "308",
+ "232",
+ "154",
+ "78"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -320,19 +330,19 @@
"PowerHint": "INTERACTION_120",
"Node": "TAUClampBoost",
"Duration": 6000,
- "Value": "246"
+ "Value": "308"
},
{
"PowerHint": "INTERACTION_90",
"Node": "TAUClampBoost",
"Duration": 6000,
- "Value": "185"
+ "Value": "232"
},
{
"PowerHint": "INTERACTION_60",
"Node": "TAUClampBoost",
"Duration": 6000,
- "Value": "123"
+ "Value": "154"
},
{
"PowerHint": "REFRESH_120FPS",
@@ -406,7 +416,7 @@
"PowerHint": "LAUNCH",
"Node": "TAUClampBoost",
"Duration": 5000,
- "Value": "553"
+ "Value": "692"
},
{
"PowerHint": "LAUNCH",
@@ -744,6 +754,12 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1100"
+ },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUMidClusterMaxFreq",
@@ -1006,19 +1022,19 @@
"PowerHint": "REFRESH_120FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "185"
+ "Value": "232"
},
{
"PowerHint": "REFRESH_90FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "123"
+ "Value": "154"
},
{
"PowerHint": "REFRESH_60FPS",
"Node": "TAUClampBoost",
"Duration": 0,
- "Value": "62"
+ "Value": "78"
},
{
"PowerHint": "DISABLE_TA_BOOST",
@@ -1102,8 +1118,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 185,
- "UclampMin_High": 384,
+ "UclampMin_Init": 232,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1126,8 +1142,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1150,8 +1166,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
- "UclampMin_Init": 129,
- "UclampMin_High": 384,
+ "UclampMin_Init": 162,
+ "UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@@ -1177,9 +1193,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 157,
- "UclampMin_Low": 157,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 197,
+ "UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1201,9 +1217,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
- "UclampMin_High": 42,
- "UclampMin_Low": 42,
+ "UclampMin_Init": 250,
+ "UclampMin_High": 53,
+ "UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1225,7 +1241,7 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
- "UclampMin_Init": 200,
+ "UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
diff --git a/self-extractors_cheetah/extract-lists.txt b/self-extractors_cheetah/extract-lists.txt
index 255e82e..9fc0800 100644
--- a/self-extractors_cheetah/extract-lists.txt
+++ b/self-extractors_cheetah/extract-lists.txt
@@ -11,7 +11,7 @@
system_ext/lib64/libmediaadaptor.so \
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
system_ext/priv-app/ShannonIms/ShannonIms.apk \
- system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.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 b/self-extractors_cheetah/google_devices/staging/Android.mk
index 6e1e67e..0e329a3 100644
--- a/self-extractors_cheetah/google_devices/staging/Android.mk
+++ b/self-extractors_cheetah/google_devices/staging/Android.mk
@@ -24,7 +24,7 @@ endif
ifneq ($(filter cheetah,$(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := QualifiedNetworksService
+LOCAL_MODULE := PixelQualifiedNetworksService
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
@@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
@@ -64,7 +64,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
@@ -80,7 +80,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := qorvo
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
diff --git a/self-extractors_cheetah/google_devices/staging/device-partial.mk b/self-extractors_cheetah/google_devices/staging/device-partial.mk
index c7a502d..45a4692 100644
--- a/self-extractors_cheetah/google_devices/staging/device-partial.mk
+++ b/self-extractors_cheetah/google_devices/staging/device-partial.mk
@@ -17,7 +17,7 @@ PRODUCT_SOONG_NAMESPACES += \
# AOSP packages required by the blobs
PRODUCT_PACKAGES := \
- QualifiedNetworksService \
+ PixelQualifiedNetworksService \
ShannonIms \
ShannonRcs \
UwbVendorService \
diff --git a/self-extractors_panther/extract-lists.txt b/self-extractors_panther/extract-lists.txt
index e09731b..63655a4 100644
--- a/self-extractors_panther/extract-lists.txt
+++ b/self-extractors_panther/extract-lists.txt
@@ -10,7 +10,7 @@
system_ext/lib64/libmediaadaptor.so \
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
system_ext/priv-app/ShannonIms/ShannonIms.apk \
- system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.apk \
+ system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
"
;;
diff --git a/self-extractors_panther/google_devices/staging/Android.mk b/self-extractors_panther/google_devices/staging/Android.mk
index 21f8297..7e7906a 100644
--- a/self-extractors_panther/google_devices/staging/Android.mk
+++ b/self-extractors_panther/google_devices/staging/Android.mk
@@ -24,7 +24,7 @@ endif
ifneq ($(filter panther,$(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := QualifiedNetworksService
+LOCAL_MODULE := PixelQualifiedNetworksService
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
@@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
@@ -64,7 +64,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
diff --git a/self-extractors_panther/google_devices/staging/device-partial.mk b/self-extractors_panther/google_devices/staging/device-partial.mk
index 72b15e6..38d2027 100644
--- a/self-extractors_panther/google_devices/staging/device-partial.mk
+++ b/self-extractors_panther/google_devices/staging/device-partial.mk
@@ -17,7 +17,7 @@ PRODUCT_SOONG_NAMESPACES += \
# AOSP packages required by the blobs
PRODUCT_PACKAGES := \
- QualifiedNetworksService \
+ PixelQualifiedNetworksService \
ShannonIms \
ShannonRcs \
diff --git a/sensors/Android.mk b/sensors/Android.mk
deleted file mode 100644
index 6e22d41..0000000
--- a/sensors/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-# HAL module implemenation stored in
-# hw/..so
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware
-LOCAL_SRC_FILES := sensors_dummy.c
-LOCAL_MODULE := sensors.cloudripper
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
-LOCAL_PROPRIETARY_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/sensors/sensors_dummy.c b/sensors/sensors_dummy.c
deleted file mode 100644
index b1edd56..0000000
--- a/sensors/sensors_dummy.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* this implements a sensors hardware library for the Android emulator.
- * the following code should be built as a shared library that will be
- * placed into /system/lib/hw/sensors.goldfish.so
- *
- * it will be loaded by the code in hardware/libhardware/hardware.c
- * which is itself called from com_android_server_SensorService.cpp
- */
-
-#define SENSORS_SERVICE_NAME "sensors"
-
-#define LOG_TAG "Dummy_Sensors"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#if 0
-#define D(...) ALOGD(__VA_ARGS__)
-#else
-#define D(...) ((void)0)
-#endif
-
-#define E(...) ALOGE(__VA_ARGS__)
-
-/** SENSOR IDS AND NAMES
- **/
-
-#define MAX_NUM_SENSORS 8
-
-#define SUPPORTED_SENSORS ((1<";
-}
-
-static int
-_sensorIdFromName( const char* name )
-{
- int nn;
-
- if (name == NULL)
- return -1;
-
- for (nn = 0; nn < MAX_NUM_SENSORS; nn++)
- if (!strcmp(name, _sensorIds[nn].name))
- return _sensorIds[nn].id;
-
- return -1;
-}
-
-/* return the current time in nanoseconds */
-static int64_t now_ns(void) {
- struct timespec ts;
- clock_gettime(CLOCK_MONOTONIC, &ts);
- return (int64_t)ts.tv_sec * 1000000000 + ts.tv_nsec;
-}
-
-/** SENSORS POLL DEVICE
- **
- ** This one is used to read sensor data from the hardware.
- ** We implement this by simply reading the data from the
- ** emulator through the QEMUD channel.
- **/
-
-typedef struct SensorDevice {
- struct sensors_poll_device_1 device;
- sensors_event_t sensors[MAX_NUM_SENSORS];
- uint32_t pendingSensors;
- int64_t timeStart;
- int64_t timeOffset;
- uint32_t active_sensors;
- int fd;
- pthread_mutex_t lock;
-} SensorDevice;
-
-/* Grab the file descriptor to the emulator's sensors service pipe.
- * This function returns a file descriptor on success, or -errno on
- * failure, and assumes the SensorDevice instance's lock is held.
- *
- * This is needed because set_delay(), poll() and activate() can be called
- * from different threads, and poll() is blocking.
- *
- * 1) On a first thread, de-activate() all sensors first, then call poll(),
- * which results in the thread blocking.
- *
- * 2) On a second thread, slightly later, call set_delay() then activate()
- * to enable the acceleration sensor.
- *
- * The system expects this to unblock the first thread which will receive
- * new sensor events after the activate() call in 2).
- *
- * This cannot work if both threads don't use the same connection.
- *
- * TODO(digit): This protocol is brittle, implement another control channel
- * for set_delay()/activate()/batch() when supporting HAL 1.3
- */
-static int sensor_device_get_fd_locked(SensorDevice* dev) {
- /* Create connection to service on first call */
- if (dev->fd < 0) {
- int ret = -errno;
- E("%s: Could not open connection to service: %s", __FUNCTION__,
- strerror(-ret));
- return ret;
- }
- return dev->fd;
-}
-
-/* Pick up one pending sensor event. On success, this returns the sensor
- * id, and sets |*event| accordingly. On failure, i.e. if there are no
- * pending events, return -EINVAL.
- *
- * Note: The device's lock must be acquired.
- */
-static int sensor_device_pick_pending_event_locked(SensorDevice* d,
- sensors_event_t* event)
-{
- uint32_t mask = SUPPORTED_SENSORS & d->pendingSensors;
-
- if (mask) {
- uint32_t i = 31 - __builtin_clz(mask);
-
- pthread_mutex_lock(&d->lock);
- d->pendingSensors &= ~(1U << i);
- *event = d->sensors[i];
- event->sensor = i;
- event->version = sizeof(*event);
- pthread_mutex_unlock(&d->lock);
- D("%s: %d [%f, %f, %f]", __FUNCTION__,
- i,
- event->data[0],
- event->data[1],
- event->data[2]);
- return i;
- }
- E("No sensor to return!!! pendingSensors=0x%08x", d->pendingSensors);
- // we may end-up in a busy loop, slow things down, just in case.
- usleep(1000);
- return -EINVAL;
-}
-
-static int sensor_device_close(struct hw_device_t* dev0)
-{
- SensorDevice* dev = (void*)dev0;
- // Assume that there are no other threads blocked on poll()
- if (dev->fd >= 0) {
- close(dev->fd);
- dev->fd = -1;
- }
- pthread_mutex_destroy(&dev->lock);
- free(dev);
- return 0;
-}
-
-/* Return an array of sensor data. This function blocks until there is sensor
- * related events to report. On success, it will write the events into the
- * |data| array, which contains |count| items. The function returns the number
- * of events written into the array, which shall never be greater than |count|.
- * On error, return -errno code.
- *
- * Note that according to the sensor HAL [1], it shall never return 0!
- *
- * [1] http://source.android.com/devices/sensors/hal-interface.html
- */
-static int sensor_device_poll(struct sensors_poll_device_t *dev0,
- sensors_event_t* data, int count)
-{
- return -EIO;
-}
-
-static int sensor_device_activate(struct sensors_poll_device_t *dev0,
- int handle,
- int enabled)
-{
- SensorDevice* dev = (void*)dev0;
-
- D("%s: handle=%s (%d) enabled=%d", __FUNCTION__,
- _sensorIdToName(handle), handle, enabled);
-
- /* Sanity check */
- if (!ID_CHECK(handle)) {
- E("%s: bad handle ID", __FUNCTION__);
- return -EINVAL;
- }
-
- /* Exit early if sensor is already enabled/disabled. */
- uint32_t mask = (1U << handle);
- uint32_t sensors = enabled ? mask : 0;
-
- pthread_mutex_lock(&dev->lock);
-
- uint32_t active = dev->active_sensors;
- uint32_t new_sensors = (active & ~mask) | (sensors & mask);
- uint32_t changed = active ^ new_sensors;
-
- if (changed)
- dev->active_sensors = new_sensors;
-
- pthread_mutex_unlock(&dev->lock);
- return 0;
-}
-
-static int sensor_device_default_flush(
- struct sensors_poll_device_1* dev0,
- int handle) {
-
- SensorDevice* dev = (void*)dev0;
-
- D("%s: handle=%s (%d)", __FUNCTION__,
- _sensorIdToName(handle), handle);
-
- /* Sanity check */
- if (!ID_CHECK(handle)) {
- E("%s: bad handle ID", __FUNCTION__);
- return -EINVAL;
- }
-
- pthread_mutex_lock(&dev->lock);
- dev->sensors[handle].version = META_DATA_VERSION;
- dev->sensors[handle].type = SENSOR_TYPE_META_DATA;
- dev->sensors[handle].sensor = 0;
- dev->sensors[handle].timestamp = 0;
- dev->sensors[handle].meta_data.what = META_DATA_FLUSH_COMPLETE;
- dev->pendingSensors |= (1U << handle);
- pthread_mutex_unlock(&dev->lock);
-
- return 0;
-}
-
-static int sensor_device_set_delay(struct sensors_poll_device_t *dev0,
- int handle __unused,
- int64_t ns)
-{
- return 0;
-}
-
-static int sensor_device_default_batch(
- struct sensors_poll_device_1* dev,
- int sensor_handle,
- int flags,
- int64_t sampling_period_ns,
- int64_t max_report_latency_ns) {
- return sensor_device_set_delay(dev, sensor_handle, sampling_period_ns);
-}
-
-/** MODULE REGISTRATION SUPPORT
- **
- ** This is required so that hardware/libhardware/hardware.c
- ** will dlopen() this library appropriately.
- **/
-
-/*
- * the following is the list of all supported sensors.
- * this table is used to build sSensorList declared below
- * according to which hardware sensors are reported as
- * available from the emulator (see get_sensors_list below)
- *
- * note: numerical values for maxRange/resolution/power for
- * all sensors but light, pressure and humidity were
- * taken from the reference AK8976A implementation
- */
-static const struct sensor_t sSensorListInit[] = {
- { .name = "Accelerometer",
- .vendor = "The Android Open Source Project",
- .version = 1,
- .handle = ID_ACCELERATION,
- .type = SENSOR_TYPE_ACCELEROMETER,
- .maxRange = 2.8f,
- .resolution = 1.0f/4032.0f,
- .power = 3.0f,
- .minDelay = 10000,
- .maxDelay = 60 * 1000 * 1000,
- .fifoReservedEventCount = 0,
- .fifoMaxEventCount = 0,
- .stringType = 0,
- .requiredPermission = 0,
- .flags = SENSOR_FLAG_CONTINUOUS_MODE,
- .reserved = {}
- },
-};
-
-static struct sensor_t sSensorList[1];
-
-static int sensors__get_sensors_list(struct sensors_module_t* module __unused,
- struct sensor_t const** list)
-{
- *list = sSensorList;
-
- return 0;
-}
-
-static int
-open_sensors(const struct hw_module_t* module,
- const char* name,
- struct hw_device_t* *device)
-{
- int status = -EINVAL;
-
- D("%s: name=%s", __FUNCTION__, name);
-
- if (!strcmp(name, SENSORS_HARDWARE_POLL)) {
- SensorDevice *dev = malloc(sizeof(*dev));
-
- memset(dev, 0, sizeof(*dev));
-
- dev->device.common.tag = HARDWARE_DEVICE_TAG;
- dev->device.common.version = SENSORS_DEVICE_API_VERSION_1_3;
- dev->device.common.module = (struct hw_module_t*) module;
- dev->device.common.close = sensor_device_close;
- dev->device.poll = sensor_device_poll;
- dev->device.activate = sensor_device_activate;
- dev->device.setDelay = sensor_device_set_delay;
-
- // Version 1.3-specific functions
- dev->device.batch = sensor_device_default_batch;
- dev->device.flush = sensor_device_default_flush;
-
- dev->fd = -1;
- pthread_mutex_init(&dev->lock, NULL);
-
- *device = &dev->device.common;
- status = 0;
- }
- return status;
-}
-
-
-static struct hw_module_methods_t sensors_module_methods = {
- .open = open_sensors
-};
-
-struct sensors_module_t HAL_MODULE_INFO_SYM = {
- .common = {
- .tag = HARDWARE_MODULE_TAG,
- .version_major = 1,
- .version_minor = 0,
- .id = SENSORS_HARDWARE_MODULE_ID,
- .name = "Dummy SENSORS Module",
- .author = "The Android Open Source Project",
- .methods = &sensors_module_methods,
- },
- .get_sensors_list = sensors__get_sensors_list
-};
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 7a2dd16..6ef7ea7 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -161,22 +161,21 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
- "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
+ "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
- "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 1200, 200, "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 2400, 1600, "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
- "TranCycle": 5
+ "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
+ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
@@ -209,7 +208,7 @@
]
},
{
- "Name":"VIRTUAL-SKIN-GPU",
+ "Name":"VIRTUAL-SKIN-CPU-GPU",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@@ -223,18 +222,44 @@
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
- "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 0, 500, "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 1500, 200, "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 2100, 1700, "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
- "TranCycle": 5
+ "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
+ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
+ {
+ "CdevRequest": "thermal-cpufreq-0",
+ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+ "MaxReleaseStep": 1,
+ "MaxThrottleStep": 1,
+ "BindedPowerRail": "S4M_VDD_CPUCL0",
+ "CdevCeiling": [0, 8, 8, 8, 8, 10, 10],
+ "LimitInfo": [0, 0, 0, 0, 8, 10, 10]
+ },
+ {
+ "CdevRequest": "thermal-cpufreq-1",
+ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+ "MaxReleaseStep": 1,
+ "MaxThrottleStep": 1,
+ "BindedPowerRail": "S3M_VDD_CPUCL1",
+ "CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
+ "LimitInfo": [0, 0, 0, 0, 12, 14, 14]
+ },
+ {
+ "CdevRequest": "thermal-cpufreq-2",
+ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+ "MaxReleaseStep": 1,
+ "MaxThrottleStep": 1,
+ "BindedPowerRail": "S2M_VDD_CPUCL2",
+ "CdevCeiling": [0, 15, 15, 15, 15, 17, 17],
+ "LimitInfo": [0, 0, 0, 0, 15, 17, 17]
+ },
{
"CdevRequest": "thermal-gpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
@@ -294,8 +319,8 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
- "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
- "Coefficient":[1.0, 1.0, 1.0, 1.0],
+ "Combination":["VIRTUAL-SKIN"],
+ "Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001,
@@ -808,5 +833,45 @@
"PowerSampleDelay":7000,
"PowerSampleCount":5
}
- ]
+ ],
+ "Stats": {
+ "Sensors": {
+ "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
+ "RecordWithThreshold": [
+ {
+ "Name": "VIRTUAL-GNSS-DISP",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-USB2-QUIET",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-QUIET-USB2",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-NEUTRAL-QUIET",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-QI-DISP",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-SKIN",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-USB-THROTTLING",
+ "Thresholds": [3.0]
+ }
+ ]
+ },
+ "CoolingDevices": {
+ "RecordVotePerSensor": {
+ "DefaultThresholdEnableAll": true
+ }
+ }
+ }
}
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index b9bf892..f0abf68 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -161,22 +161,21 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
- "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
+ "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
- "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 1200, 200, "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 2400, 1600, "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
- "TranCycle": 5
+ "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
+ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
@@ -209,7 +208,7 @@
]
},
{
- "Name":"VIRTUAL-SKIN-GPU",
+ "Name":"VIRTUAL-SKIN-CPU-GPU",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@@ -223,18 +222,44 @@
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
- "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 0, 500, "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 1500, 200, "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 2100, 1700, "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
- "TranCycle": 5
+ "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
+ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
+ {
+ "CdevRequest": "thermal-cpufreq-0",
+ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+ "MaxReleaseStep": 1,
+ "MaxThrottleStep": 1,
+ "BindedPowerRail": "S4M_VDD_CPUCL0",
+ "CdevCeiling": [0, 8, 8, 8, 8, 10, 10],
+ "LimitInfo": [0, 0, 0, 0, 8, 10, 10]
+ },
+ {
+ "CdevRequest": "thermal-cpufreq-1",
+ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+ "MaxReleaseStep": 1,
+ "MaxThrottleStep": 1,
+ "BindedPowerRail": "S3M_VDD_CPUCL1",
+ "CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
+ "LimitInfo": [0, 0, 0, 0, 12, 14, 14]
+ },
+ {
+ "CdevRequest": "thermal-cpufreq-2",
+ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+ "MaxReleaseStep": 1,
+ "MaxThrottleStep": 1,
+ "BindedPowerRail": "S2M_VDD_CPUCL2",
+ "CdevCeiling": [0, 15, 15, 15, 15, 17, 17],
+ "LimitInfo": [0, 0, 0, 0, 15, 17, 17]
+ },
{
"CdevRequest": "thermal-gpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
@@ -809,5 +834,45 @@
"PowerSampleDelay":7000,
"PowerSampleCount":5
}
- ]
+ ],
+ "Stats": {
+ "Sensors": {
+ "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
+ "RecordWithThreshold": [
+ {
+ "Name": "VIRTUAL-QUIET-QI",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-USB-QUIET",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-QUIET-DISP",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-NEUTRAL-QUIET",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-QI-DISP",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-SKIN",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-USB-THROTTLING",
+ "Thresholds": [3.0]
+ }
+ ]
+ },
+ "CoolingDevices": {
+ "RecordVotePerSensor": {
+ "DefaultThresholdEnableAll": true
+ }
+ }
+ }
}
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index e123728..f9fd8c7 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -1,21 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
ant0.ch5.prf16.ant_delay=16447
ant0.ch5.prf16.tx_power=0x53532B53
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
ant0.ch5.prf64.tx_power=0x53532B53
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0x34
@@ -23,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
ant0.ch9.prf16.tx_power=0x53532753
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
ant0.ch9.prf64.tx_power=0x53532753
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x34
@@ -42,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
ant1.ch9.prf16.tx_power=0x47472347
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0x34
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
ant1.ch9.prf64.tx_power=0x47472347
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0x34
@@ -110,6 +104,7 @@ temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6
diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf
index 4affed8..c48282f 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -1,21 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
ant0.ch5.prf16.ant_delay=16447
ant0.ch5.prf16.tx_power=0x67672F67
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
ant0.ch5.prf64.tx_power=0x67672F67
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0x26
@@ -23,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
ant0.ch9.prf16.tx_power=0x57572B57
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
ant0.ch9.prf64.tx_power=0x57572B57
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x26
@@ -42,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
ant1.ch9.prf16.tx_power=0x47472347
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
ant1.ch9.prf64.tx_power=0x47472347
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0x26
@@ -110,6 +104,7 @@ temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6
diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 4affed8..c48282f 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -1,21 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
ant0.ch5.prf16.ant_delay=16447
ant0.ch5.prf16.tx_power=0x67672F67
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
ant0.ch5.prf64.tx_power=0x67672F67
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0x26
@@ -23,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
ant0.ch9.prf16.tx_power=0x57572B57
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
ant0.ch9.prf64.tx_power=0x57572B57
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x26
@@ -42,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
ant1.ch9.prf16.tx_power=0x47472347
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
ant1.ch9.prf64.tx_power=0x47472347
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0x26
@@ -110,6 +104,7 @@ temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6
diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf
index 8798ccd..42e7d28 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -1,21 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x01
ant0.ch5.prf16.ant_delay=16447
ant0.ch5.prf16.tx_power=0
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
ant0.ch5.prf64.tx_power=0
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0
@@ -23,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
ant0.ch9.prf16.tx_power=0x5F5F2F5F
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
ant0.ch9.prf64.tx_power=0x5F5F2F5F
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x26
@@ -42,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
ant1.ch9.prf16.tx_power=0x3B3B1F3B
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
ant1.ch9.prf64.tx_power=0x3B3B1F3B
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0x26
@@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000
alternate_pulse_shape=0x01
restricted_channels=0x20
+[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
index 3732304..df92eb3 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -1,21 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
ant0.ch5.prf16.ant_delay=16447
ant0.ch5.prf16.tx_power=0x67672F67
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
ant0.ch5.prf64.tx_power=0x67672F67
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0x26
@@ -23,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
ant0.ch9.prf16.tx_power=0x57572B57
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
ant0.ch9.prf64.tx_power=0x57572B57
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x26
@@ -42,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
ant1.ch9.prf16.tx_power=0x47472347
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
ant1.ch9.prf64.tx_power=0x47472347
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0x26
@@ -110,6 +104,7 @@ temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
restricted_channels=0xFFFF
+[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
index e7e7863..d9d6e84 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -1,21 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
ant0.ch5.prf16.ant_delay=16447
ant0.ch5.prf16.tx_power=0x67672F67
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
ant0.ch5.prf64.tx_power=0x67672F67
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0x26
@@ -23,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
ant0.ch9.prf16.tx_power=0x57572B57
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
ant0.ch9.prf64.tx_power=0x57572B57
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x26
@@ -42,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
ant1.ch9.prf16.tx_power=0x47472347
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
ant1.ch9.prf64.tx_power=0x47472347
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0x26
@@ -110,6 +104,7 @@ temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
restricted_channels=0x20
+[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index a1e9de1..796507b 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -1,21 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
[CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
ant0.ch5.prf16.ant_delay=16447
ant0.ch5.prf16.tx_power=0x67672F67
ant0.ch5.prf16.pg_count=0
ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
ant0.ch5.prf64.tx_power=0x67672F67
ant0.ch5.prf64.pg_count=0
ant0.ch5.prf64.pg_delay=0x26
@@ -23,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
ant0.ch9.prf16.tx_power=0x5F5F2F5F
ant0.ch9.prf16.pg_count=0
ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
ant0.ch9.prf64.tx_power=0x5F5F2F5F
ant0.ch9.prf64.pg_count=0
ant0.ch9.prf64.pg_delay=0x26
@@ -42,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
ant1.ch9.prf16.tx_power=0x47472347
ant1.ch9.prf16.pg_count=0
ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
ant1.ch9.prf64.tx_power=0x47472347
ant1.ch9.prf64.pg_count=0
ant1.ch9.prf64.pg_delay=0x26
@@ -110,6 +104,7 @@ temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6
@@ -150,4 +145,4 @@ coex_gpio=4
coex_delay_us=1000
coex_margin_us=500
coex_interval_us=2000
-alternate_pulse_shape=0x01
+alternate_pulse_shape=0x00
diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf
index 4ec8453..74d24d8 100644
--- a/wifi/p2p_supplicant_overlay.conf
+++ b/wifi/p2p_supplicant_overlay.conf
@@ -8,3 +8,4 @@ p2p_add_cli_chan=1
disable_scan_offload=1
p2p_go_vht=1
p2p_pref_chan=124:149, 115:36
+p2p_6ghz_disable=1