From 116d3c9468a3739723d135e07b67ce10d0058cf2 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Sat, 10 Dec 2022 14:16:50 +0000 Subject: [PATCH 1/2] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: Ib484b481f2f6193e14f397e240d6207b21dc7990 Signed-off-by: Ken Yang --- device-oriole.mk | 7 +++---- device-raven.mk | 7 ++++--- device-slider.mk | 6 +++--- device-whitefin.mk | 7 ++++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index d35ed59..b9a1f65 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -36,6 +36,9 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk +# wireless_charger HAL service +include device/google/gs-common/wireless_charger/wireless_charger.mk + ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else @@ -103,10 +106,6 @@ endif PRODUCT_COPY_FILES += \ device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf - -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # MIPI Coex Configs PRODUCT_COPY_FILES += \ device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \ diff --git a/device-raven.mk b/device-raven.mk index a9ec847..5eec93b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -35,6 +35,10 @@ include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk +# wireless_charger HAL service +include device/google/gs-common/wireless_charger/wireless_charger.mk + + ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else @@ -110,9 +114,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # MIPI Coex Configs PRODUCT_COPY_FILES += \ device/google/raviole/radio/raven_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv diff --git a/device-slider.mk b/device-slider.mk index 60a0729..35f828a 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -30,14 +30,14 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk +# wireless_charger HAL service +include device/google/gs-common/wireless_charger/wireless_charger.mk + # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.slider.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.slider.rc diff --git a/device-whitefin.mk b/device-whitefin.mk index 35ea738..7c2a533 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -30,14 +30,15 @@ include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk +# wireless_charger HAL service needs to be included specially due to no raviole-sepolicy folder +PRODUCT_PACKAGES += vendor.google.wireless_charger-default +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml + # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.whitefin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.whitefin.rc From c6e061bf631677be80448c258016fce8c3e3b317 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Tue, 6 Dec 2022 22:00:30 +0000 Subject: [PATCH 2/2] Disable HWUI adpf by default and enable in device.mk * Make HWUI disabled by default for vendors * Explicitly enable in supported devices * Consolidate flags for HWUI and SF Bug: b/261628396 Test: manual Change-Id: I85443730a1a278975c7204f96d6091bf8e293e41 --- device-oriole.mk | 4 ---- device-raven.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index b9a1f65..39a7a28 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -257,10 +257,6 @@ PRODUCT_PACKAGES += \ 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 - # Bluetooth OPUS codec PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true diff --git a/device-raven.mk b/device-raven.mk index 5eec93b..cafe953 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -273,10 +273,6 @@ PRODUCT_PACKAGES += \ 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 - # Display RRS default Config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1440x3120@120