Snap for 9178695 from 2ece1b7eb1 to udc-release

Change-Id: I82089c67781997cef55023299436fab6e4c204a9

BoardConfig-common.mk

@@ -129,7 +129,7 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 BOARD_USES_SWIFTSHADER := false
 
 # This should be the same value as USE_ANGLE in device.mk
-BOARD_USES_ANGLE := false
+BOARD_USES_ANGLE := true
 
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)

conf/init.gs201.rc

@@ -306,6 +306,9 @@ on init
     # Disable dock-defend by default
     chown system system /sys/devices/platform/google,charger/dd_settings
     write /sys/devices/platform/google,charger/dd_settings -1
+    # Enable charger mode (aka off-mode charging) by default
+    chown system system /sys/class/power_supply/battery/charger_mode
+    write /sys/class/power_supply/battery/charger_mode 1
 
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
@@ -848,6 +851,14 @@ on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
     setprop persist.vendor.charge.start.level 0
     setprop vendor.battery.defender.disable 1
 
+# Clear the state of charger_mode
+on property:persist.vendor.charger_mode.enable=1
+    write /sys/class/power_supply/battery/charger_mode 0
+
+# Enable charger_mode when user triggers shutdown from menu
+on property:sys.shutdown.requested=0userrequested
+    write /sys/class/power_supply/battery/charger_mode 1
+
 # on userdebug and eng builds, enable scsi error recovery log
 on property:ro.debuggable=1
     write /sys/module/scsi_mod/parameters/scsi_logging_level 63

device.mk

@@ -203,7 +203,7 @@ endif
 USE_SWIFTSHADER := false
 
 # Must match BOARD_USES_ANGLE in BoardConfig.mk
-USE_ANGLE := false
+USE_ANGLE := true
 
 # HWUI
 TARGET_USES_VULKAN = true

pixelstats/service.cpp

@@ -58,6 +58,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     },
     .BlockStatsLength = BLOCK_STATS_LENGTH,
     .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
+    .MitigationPath = "/sys/devices/virtual/pmic/mitigation",
     .ThermalStatsPaths = {
         "/sys/devices/platform/100a0000.BIG/trip_counter",
         "/sys/devices/platform/100a0000.MID/trip_counter",