From 7609b0337005c5f95a22f40cdf01e57b6d651700 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Tue, 6 Dec 2022 21:56:55 +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: I317c48869a86597ff8bb234007f1b752ce422a6e --- device-felix.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index f349cbc..7cc3e4b 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -281,10 +281,6 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/felix/device_framework 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 - # Control camera exif model/make redaction PRODUCT_PROPERTY_OVERRIDES += \ persist.camera.redact_exif=1 From 4e658707336ccf5a6991509eec19fda5f8ce87b1 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Sat, 10 Dec 2022 14:19:40 +0000 Subject: [PATCH 2/2] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: I17cfec73431282042c59caf1a109749f34ee2e96 Signed-off-by: Ken Yang --- device-felix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-felix.mk b/device-felix.mk index 5a500ad..ec9c625 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -37,6 +37,7 @@ include device/google/gs-common/touch/stm/stm6.mk ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) include device/google/felix/uwb/uwb_calibration.mk endif +include device/google/gs-common/wireless_charger/wireless_charger.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,felix)