Merge "bfq: turn off slice_idle during booting" into sc-dev
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 888761d..8a07eb9 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -133,10 +133,6 @@
# Graphics
#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
-# Storage options
-BOARD_USES_VENDORIMAGE := true
-TARGET_COPY_OUT_VENDOR := vendor
-
# Enable chain partition for system.
BOARD_AVB_VBMETA_SYSTEM := system system_ext product
BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
@@ -144,6 +140,12 @@
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
+# Enable chained vbmeta for boot images
+BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048
+BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2
+
TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_USE_F2FS := true
BOARD_USERDATAIMAGE_PARTITION_SIZE := 11796480000
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index 1938442..ed29152 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -80,7 +80,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.google.wireless_charger</name>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>
diff --git a/conf/fstab.gs101 b/conf/fstab.gs101
index f002b03..d649b1b 100644
--- a/conf/fstab.gs101
+++ b/conf/fstab.gs101
@@ -8,6 +8,7 @@
system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount
+/dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata ext4 defaults,noatime,rw wait,check,formattable
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 3142a99..6b5010c 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -223,7 +223,7 @@
<hal format="hidl">
<name>vendor.google.wireless_charger</name>
<transport>hwbinder</transport>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 8dd4c31..2c0a308 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -223,7 +223,7 @@
<hal format="hidl">
<name>vendor.google.wireless_charger</name>
<transport>hwbinder</transport>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>
diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml
index 750dbc2..3688484 100644
--- a/manifest_64-gralloc3.xml
+++ b/manifest_64-gralloc3.xml
@@ -212,7 +212,7 @@
<hal format="hidl">
<name>vendor.google.wireless_charger</name>
<transport>hwbinder</transport>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>
diff --git a/manifest_64.xml b/manifest_64.xml
index 7f38648..78f6a01 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -212,7 +212,7 @@
<hal format="hidl">
<name>vendor.google.wireless_charger</name>
<transport>hwbinder</transport>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1e2628a..d2d9f0f 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -75,9 +75,6 @@
<!-- Type of the ambient tap sensor. Empty if ambient tap is not supported. -->
<string name="config_dozeTapSensorType" translatable="false">com.google.sensor.single_touch</string>
- <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
- <string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
-
<!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
<bool name="config_unplugTurnsOnScreen">true</bool>