From 35de89e67594e91a12910503b19a51d74600064a Mon Sep 17 00:00:00 2001 From: Cyan Hsieh Date: Mon, 10 Jan 2022 03:28:24 +0000 Subject: [PATCH 1/2] Revert^3 "Add gralloc switch" 9f0eac1cb92988981a27ac9c64c89aaa4403a288 Bug: 213540102 Change-Id: I7f7fe674cfcc6641dcaa9ac54f164adeb8c9fce8 --- device.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/device.mk b/device.mk index 2facc806..ff5d0bd6 100644 --- a/device.mk +++ b/device.mk @@ -34,14 +34,6 @@ VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH) # Set boot SPL BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH) -# TODO(b/207450311): Remove this flag once implemented -USE_PIXEL_GRALLOC := false -ifeq ($(USE_PIXEL_GRALLOC),true) - PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL -else - PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/gralloc4 -endif - PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ hardware/google/gchips \ From f0fa8db7c9c780b579c7fe085d826f83693054ef Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Mon, 10 Jan 2022 12:17:52 +0800 Subject: [PATCH 2/2] remove retaildemo settings from gs101 and set in the individual file Bug: 204926279 Test: check demo mode functionality Signed-off-by: Jack Wu Change-Id: I5205510746132b0edfd3db2a6c44deaf133b3b05 --- conf/init.gs101.rc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 87240446..66f58ada 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -743,12 +743,6 @@ on property:sys.boot_completed=1 chown root system /sys/devices/platform/19000000.aoc/reset chmod 0220 /sys/devices/platform/19000000.aoc/reset -# charger driver exposes now finer grain control, map demo mode to those properties -# NOTE: demo mode can only be exit wiping data (which reset the persist properties) -on property:sys.retaildemo.enabled=1 - setprop persist.vendor.charge.stop.level 35 - setprop persist.vendor.charge.start.level 30 - # Test Harness Mode default battery profile. on property:persist.sys.test_harness=1 && property:persist.vendor.testing_battery_profile=0 setprop persist.vendor.charge.stop.level 70