From 45b021eeb32a1ca579871bc759c0893ec677d650 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Thu, 16 Dec 2021 11:29:57 -0800 Subject: [PATCH 1/5] Use soong_config_ macros to set Soong config variables. Bug: 198503843 Test: treehugger Change-Id: I0a89cee756fd93e3c485c74aec5fcbbc66f850f9 --- device-felix.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index 5360dee..6711c0a 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -35,8 +35,8 @@ ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) include device/google/felix/uwb/uwb_calibration.mk endif -SOONG_CONFIG_lyric_tuning_product := felix -SOONG_CONFIG_google3a_config_target_device := felix +$(call soong_config_set,lyric,tuning_product,felix) +$(call soong_config_set,google3a_config,target_device,felix) BOARD_SEPOLICY_DIRS += \ hardware/google/pixel-sepolicy/vibrator/common \ From a425c46f802b77a25d709b9c178f5b0471fe6a9c Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Wed, 29 Dec 2021 10:22:15 +0800 Subject: [PATCH 2/5] powerstats: use gs common library to get common data providers Bug: 206576142 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I72cabe195bcd07a4126886a97f24c638537274c3 Signed-off-by: Darren Hsu --- powerstats/felix/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/felix/Android.bp b/powerstats/felix/Android.bp index e3f93cb..b7c146f 100644 --- a/powerstats/felix/Android.bp +++ b/powerstats/felix/Android.bp @@ -15,7 +15,7 @@ soong_namespace { imports: [ "hardware/google/pixel", - "device/google/gs201", + "device/google/gs201/powerstats", ] } From 0af8306f743d112477ffae76f956212cd0760a96 Mon Sep 17 00:00:00 2001 From: Stephane Lee Date: Wed, 19 Jan 2022 17:48:23 -0800 Subject: [PATCH 3/5] Add device-specific support for GoogleBattery HAL 1.2. Bug: 205021987 Test: Ensure Adaptive Charging/Battery health flags works as expected. Change-Id: I129b16b62f30f0ceadff50e3554403a81a93f521 --- manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index fd1ce3e..b87c09a 100644 --- a/manifest.xml +++ b/manifest.xml @@ -134,7 +134,7 @@ vendor.google.google_battery hwbinder - 1.1 + 1.2 IGoogleBattery default From 08fdad3260a37024f0ddccd51a90e7148ce6cf51 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Fri, 28 Jan 2022 12:42:59 -0800 Subject: [PATCH 4/5] Migrate "rounded_corner_content_padding" This CL updates resource overlay of rounded_corner_content_padding so that the same device-specific value can be seen from both the Framework code and the SysUI. With my previous CL [1], the SysUI continues to see the same value even after this migration. [1]: I0c3717c0bdfc928167c6eba06247b37caabf33b9 24d6b891f572f7be419d3acc9793ca68d062cf35 Bug: 215554582 Test: presubmit Change-Id: I7564a8d3f587ce735b74fbda6b4ea066f266d486 --- .../base/core/res/res/values/dimens.xml | 21 +++++++++++++++++++ .../packages/SystemUI/res/values/dimens.xml | 3 --- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 felix/overlay/frameworks/base/core/res/res/values/dimens.xml diff --git a/felix/overlay/frameworks/base/core/res/res/values/dimens.xml b/felix/overlay/frameworks/base/core/res/res/values/dimens.xml new file mode 100644 index 0000000..dfe4515 --- /dev/null +++ b/felix/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -0,0 +1,21 @@ + + + + + 50px + diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index c668d76..a2ea70c 100644 --- a/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -19,9 +19,6 @@ 0dp - - 50px - 1px From 0f5a142a125758fc6841ab9ba12d67b5ce7afee9 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Thu, 10 Feb 2022 16:09:22 -0800 Subject: [PATCH 5/5] uwb: use per device factory calibration Use device specific script to select which factory calibration values to use. Bug: 218719905 Test: build Signed-off-by: Victor Liu Change-Id: I1750cb6c17de69dc3a86ce01fa1e023194591358 --- device-felix.mk | 2 +- uwb/uwb_calibration.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 6711c0a..9ee8feb 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -30,8 +30,8 @@ include device/google/felix/audio/felix/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device-stereo-specific-revision.mk include hardware/google/pixel/vibrator/cs40l26/device-stereo-specific-revision.mk include device/google/gs101/bluetooth/bluetooth.mk -include device/google/gs201/uwb/uwb.mk ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) +include device/google/gs101/uwb/uwb.mk include device/google/felix/uwb/uwb_calibration.mk endif diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index d2340e7..5ef15ce 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -19,3 +19,4 @@ PRODUCT_COPY_FILES += \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \ + vendor/qorvo/uwb/aosp/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \