Snap for 8211263 from 04b84d343b to udc-release

Change-Id: Ia5f2de37e289fa5ddea86b493599f6e292452a97

BoardConfig-common.mk

@@ -36,7 +36,6 @@ BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
-BOARD_BOOTCONFIG += androidboot.selinux=permissive
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false

conf/init.recovery.device.rc

@@ -1,4 +1,5 @@
 on init
+    wait /sys/devices/platform/11210000.usb/11210000.dwc3/driver 10
     setprop sys.usb.controller "11210000.dwc3"
     setprop sys.usb.configfs 1
 

device-common.mk

@@ -33,7 +33,7 @@ PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google
 PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS201
 
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.vendor.testing_battery_profile=0
+    persist.vendor.testing_battery_profile=2
 
 # ZramWriteback
 -include hardware/google/pixel/mm/device_gki.mk

device.mk

@@ -382,9 +382,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.usb.usbradio.config=dm
 endif
 
-# Power HAL
-PRODUCT_COPY_FILES += \
-	device/google/gs201/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
 # adpf 16ms update rate
 PRODUCT_PRODUCT_PROPERTIES += \
         vendor.powerhal.adpf.rate=16666666

factory_common.mk

@@ -54,8 +54,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
 
 # factory should always has SELinux permissive
-#BOARD_BOOTCONFIG += androidboot.selinux=permissive
-#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
+BOARD_BOOTCONFIG += androidboot.selinux=permissive
+BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Disable Bluetooth as default in factory build
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory