From c60aa4bab12d531762787e1f98717067dcc1f0d4 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Tue, 6 Dec 2022 22:06:23 +0000 Subject: [PATCH 1/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: Icd420ada955ef2034a23f1e591ea95948cd06072 --- device-bluejay.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4bd5921..296c39e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -236,10 +236,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Biometrics virtual HAL for e2e testing PRODUCT_PACKAGES_DEBUG += \ android.hardware.biometrics.fingerprint-service.example From 6ffba1554219d07955a1ae97e101c280c3b6b775 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Wed, 21 Dec 2022 00:57:36 +0000 Subject: [PATCH 2/2] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: Ie61251922a6ec7a087a089902eaf2e5291e53342 Signed-off-by: Ken Yang --- device-bluejay.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4ff234d..af471d6 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -37,6 +37,9 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk +# wireless_charger HAL service due to healthd and batteryinfo dependency +include device/google/gs-common/wireless_charger/wireless_charger.mk + ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else