From 69e68ee6c44e14ceeff1a826c3a629f0caf9d76a Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Sat, 10 Dec 2022 14:21:12 +0000 Subject: [PATCH 1/2] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: Iaabbc057f697824b01d20de2b52f9cbab12acf44 Signed-off-by: Ken Yang --- device-cheetah.mk | 1 + device-cloudripper.mk | 1 + device-panther.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 9d2ca76..9638e2e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -31,6 +31,7 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna.mk +include device/google/gs-common/wireless_charger/wireless_charger.mk ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 447bf2a..fb6716f 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -27,6 +27,7 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna.mk +include device/google/gs-common/wireless_charger/wireless_charger.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,cloudripper) diff --git a/device-panther.mk b/device-panther.mk index bb08046..73232bc 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -31,6 +31,7 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/focaltech/focaltech.mk +include device/google/gs-common/wireless_charger/wireless_charger.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,panther) From 0204c4d0ef2d1f7f60598331daad4735edf3adf5 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Tue, 6 Dec 2022 22:01:14 +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: Ifda3bfcfdd38a7c2b23b2573e29ad974fe159683 --- device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 9638e2e..0410e14 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -357,10 +357,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ 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 - # Virtual fingerprint HAL PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example diff --git a/device-panther.mk b/device-panther.mk index 73232bc..b345e8d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -340,10 +340,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ 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 - # Virtual fingerprint HAL PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example