From b1046f32d532d7ed143ed5ba8cf18086318fc671 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Mon, 19 Sep 2022 03:53:51 +0000 Subject: [PATCH 1/6] Add by project le audio offload capabilities config file We create by project offload capabilities config file to make each project have its own customized default device offload capabilities. Bug: 238983662 Test: make sure file added in config folder can be copied into devices Change-Id: I23ac69ef5770a6e471a70f18205c027f2976af16 --- .../cheetah/le_audio_codec_capabilities.xml | 84 +++++++++++++++++++ device-cheetah.mk | 5 ++ 2 files changed, 89 insertions(+) create mode 100644 bluetooth/cheetah/le_audio_codec_capabilities.xml diff --git a/bluetooth/cheetah/le_audio_codec_capabilities.xml b/bluetooth/cheetah/le_audio_codec_capabilities.xml new file mode 100644 index 0000000..cfb915b --- /dev/null +++ b/bluetooth/cheetah/le_audio_codec_capabilities.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device-cheetah.mk b/device-cheetah.mk index 9f69170..07ce16e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -181,12 +181,17 @@ 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 +# LE Auido Offload Capabilities setting +PRODUCT_COPY_FILES += \ + device/google/pantah/bluetooth/cheetah/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool From 1586f2ae70865351b47f02a3a2984adab615f64b Mon Sep 17 00:00:00 2001 From: shihchienc Date: Thu, 15 Sep 2022 11:50:57 +0000 Subject: [PATCH 2/6] Add by project le audio offload capabilities config file We create by project offload capabilities config file to make each project have its own customized default device offload capabilities. Bug: 238983662 Test: make sure file added in config folder can be copied into devices Change-Id: Ibc12a2774d3b32fe54574372121ce3e93d395167 Merged-In: Ibc12a2774d3b32fe54574372121ce3e93d395167 (cherry picked from commit c337787e1d8b23703b90931e641982ea0416dae6) --- .../panther/le_audio_codec_capabilities.xml | 84 +++++++++++++++++++ device-panther.mk | 4 + 2 files changed, 88 insertions(+) create mode 100644 bluetooth/panther/le_audio_codec_capabilities.xml diff --git a/bluetooth/panther/le_audio_codec_capabilities.xml b/bluetooth/panther/le_audio_codec_capabilities.xml new file mode 100644 index 0000000..cfb915b --- /dev/null +++ b/bluetooth/panther/le_audio_codec_capabilities.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device-panther.mk b/device-panther.mk index ea3735d..8cc0266 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -274,6 +274,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true +# LE Auido Offload Capabilities setting +PRODUCT_COPY_FILES += \ + device/google/pantah/bluetooth/panther/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool From a70d7022f0f0c55cb7f87ffd06812a91c5a2bb1e Mon Sep 17 00:00:00 2001 From: shihchienc Date: Mon, 19 Sep 2022 03:53:51 +0000 Subject: [PATCH 3/6] Add by project le audio offload capabilities config file We create by project offload capabilities config file to make each project have its own customized default device offload capabilities. Bug: 238983662 Test: make sure file added in config folder can be copied into devices Change-Id: I23ac69ef5770a6e471a70f18205c027f2976af16 Merged-In: I23ac69ef5770a6e471a70f18205c027f2976af16 (cherry picked from commit e559a93d8f690bbe811f8316f61a100964313bfc) --- .../cheetah/le_audio_codec_capabilities.xml | 84 +++++++++++++++++++ device-cheetah.mk | 4 + 2 files changed, 88 insertions(+) create mode 100644 bluetooth/cheetah/le_audio_codec_capabilities.xml diff --git a/bluetooth/cheetah/le_audio_codec_capabilities.xml b/bluetooth/cheetah/le_audio_codec_capabilities.xml new file mode 100644 index 0000000..cfb915b --- /dev/null +++ b/bluetooth/cheetah/le_audio_codec_capabilities.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device-cheetah.mk b/device-cheetah.mk index 0e62814..236e527 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -286,6 +286,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true +# LE Auido Offload Capabilities setting +PRODUCT_COPY_FILES += \ + device/google/pantah/bluetooth/cheetah/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool From 94f442871ffed2aad106dffd2cc37185ee0e47cc Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:55:22 -0700 Subject: [PATCH 4/6] p10: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: I198e4991e06951e0b324726649c9e967e8aac6fb --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index f617337..9369361 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,11 +202,6 @@ com.google.sensor.quick_pickup - - 34 - 0.335 From 0b07828ad57241602352080047a25eca9898c53a Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:59:00 -0700 Subject: [PATCH 5/6] c10: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: I1ef0a67006d57cafa2e7a74c70b0cd176a094c2d --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) 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 3c371ab..8143486 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -180,11 +180,6 @@ com.google.sensor.quick_pickup - - 25 - 0.335 From 9d3f69448431c380deb2b7235e42c5156335c901 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Fri, 22 Jul 2022 10:07:47 -0700 Subject: [PATCH 6/6] Revert "thermal: remove gxp cooling device dependency" This reverts commit af3528b9034a5e590ec1017f9f4b6be4a31d46bb. Re-enable gxp cooling device Bug: 238273184 Test: Build and boot on device Signed-off-by: Sayanna Chandula Change-Id: I6e7eac3f8b15fffccbf64c80f8af7866b9397e4f --- thermal_info_config_cheetah.json | 9 +++++++++ thermal_info_config_panther.json | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 200db05..db7f985 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -129,6 +129,10 @@ { "CdevRequest": "tpu_cooling", "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + }, + { + "CdevRequest": "gxp-cooling", + "LimitInfo": [0, 0, 0, 0, 0, 9, 9] } ] }, @@ -754,6 +758,11 @@ "Name":"tpu_cooling", "Type":"NPU", "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + }, + { + "Name":"gxp-cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[ diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 66982e8..57174cf 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -129,6 +129,10 @@ { "CdevRequest": "tpu_cooling", "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + }, + { + "CdevRequest": "gxp-cooling", + "LimitInfo": [0, 0, 0, 0, 0, 9, 9] } ] }, @@ -755,6 +759,11 @@ "Name":"tpu_cooling", "Type":"NPU", "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + }, + { + "Name":"gxp-cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[