From 7a0b4edfb304af03d41d99cab091c9c6903e38b3 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Fri, 27 Sep 2019 10:44:26 +0800
Subject: [PATCH] Changes for September 2019

- Use a slightly altered apply-patches
- Don't enforce privapp permissions
- arm-ab needs a size increase to fit
- Revert LOS's FOD implementation so we can keep using PHH's
- Add hardware keys overlays
- Don't specify an alternative wallpaper cropper, use LOS gallery
---
 ...ase-system-partition-size-for-arm_ab.patch | 24 +++++++++++
 0001-treble-Add-overlay-lineage.patch         | 42 +++++++++++++++----
 ...ecify-config_wallpaperCropperPackage.patch | 25 +++++++++++
 ...og-privapp-permissions-whitelist-vio.patch | 30 +++++++++++++
 README.md                                     |  2 +-
 build_treble_vanilla.sh                       | 10 +++++
 6 files changed, 125 insertions(+), 8 deletions(-)
 create mode 100644 0001-Increase-system-partition-size-for-arm_ab.patch
 create mode 100644 0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
 create mode 100644 0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch

diff --git a/0001-Increase-system-partition-size-for-arm_ab.patch b/0001-Increase-system-partition-size-for-arm_ab.patch
new file mode 100644
index 0000000..8094981
--- /dev/null
+++ b/0001-Increase-system-partition-size-for-arm_ab.patch
@@ -0,0 +1,24 @@
+From 037c36f36b8f71bd2001c30285bcfcd6523973b0 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 4 Sep 2019 01:37:30 +0000
+Subject: [PATCH] Increase system partition size for arm_ab
+
+Change-Id: I3ac099dd64624ec27c5fb64ce3fa3a9e500402e5
+---
+ phhgsi_arm_ab/BoardConfig.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/phhgsi_arm_ab/BoardConfig.mk b/phhgsi_arm_ab/BoardConfig.mk
+index 18aaace..5726959 100644
+--- a/phhgsi_arm_ab/BoardConfig.mk
++++ b/phhgsi_arm_ab/BoardConfig.mk
+@@ -2,5 +2,5 @@ include build/make/target/board/generic_arm_ab/BoardConfig.mk
+ include device/phh/treble/board-base.mk
+ 
+ ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
++BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1313583104
+ endif
+-- 
+2.17.1
+
diff --git a/0001-treble-Add-overlay-lineage.patch b/0001-treble-Add-overlay-lineage.patch
index f1f31a7..38b9f74 100644
--- a/0001-treble-Add-overlay-lineage.patch
+++ b/0001-treble-Add-overlay-lineage.patch
@@ -1,4 +1,4 @@
-From 96b7b373bc8d01fba994e10fa2f2e7f3a0327252 Mon Sep 17 00:00:00 2001
+From b35194fdd618f1ae2682c6d285d92a4ae7d421cc Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Mon, 15 Jul 2019 10:43:52 +0000
 Subject: [PATCH] treble: Add overlay-lineage
@@ -6,15 +6,15 @@ Subject: [PATCH] treble: Add overlay-lineage
 Change-Id: I9d313b1488d98acc7cf37d23820946ee99745426
 ---
  base.mk                                       |  4 +-
- .../lineage/res/res/values/config.xml         | 53 +++++++++++++++++++
- 2 files changed, 56 insertions(+), 1 deletion(-)
+ .../lineage/res/res/values/config.xml         | 81 +++++++++++++++++++
+ 2 files changed, 84 insertions(+), 1 deletion(-)
  create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 
 diff --git a/base.mk b/base.mk
-index 3fc54cd..57c982c 100644
+index 8636247..f18e1c7 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -9,7 +9,9 @@ PRODUCT_COPY_FILES += \
+@@ -11,7 +11,9 @@ PRODUCT_COPY_FILES += \
  	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
  
  BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy
@@ -27,10 +27,10 @@ index 3fc54cd..57c982c 100644
  $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 new file mode 100644
-index 0000000..b4a2aec
+index 0000000..8df673a
 --- /dev/null
 +++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,81 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!--
 +     Copyright (C) 2015-2016 The CyanogenMod Project
@@ -83,6 +83,34 @@ index 0000000..b4a2aec
 +         For example, a device with notification and battery lights that supports
 +         pulsating and RGB control would set this config to 75. -->
 +    <integer name="config_deviceLightCapabilities">255</integer>
++
++    <!-- Hardware keys present on the device, stored as a bit field.
++         This integer should equal the sum of the corresponding value for each
++         of the following keys present:
++             1 - Home
++             2 - Back
++             4 - Menu
++             8 - Assistant (search)
++            16 - App switch
++            32 - Camera
++            64 - Volume rocker
++         For example, a device with Home, Back and Menu keys would set this
++         config to 7. -->
++    <integer name="config_deviceHardwareKeys">127</integer>
++
++    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
++         This integer should equal the sum of the corresponding value for each
++         of the following keys present:
++             1 - Home
++             2 - Back
++             4 - Menu
++             8 - Assistant (search)
++            16 - App switch
++            32 - Camera
++            64 - Volume rocker
++         For example, a device with Home, Back and Menu keys would set this
++         config to 7. -->
++    <integer name="config_deviceHardwareWakeKeys">127</integer>
 +</resources>
 -- 
 2.17.1
diff --git a/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch b/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
new file mode 100644
index 0000000..e2be227
--- /dev/null
+++ b/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
@@ -0,0 +1,25 @@
+From 5180f2417b628e6f1611ce24fd54f711fbdbb991 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 10 Sep 2019 02:42:36 +0000
+Subject: [PATCH] treble: Don't specify config_wallpaperCropperPackage
+
+Change-Id: I72b59def304779e4bd9a399c01cf1180d15bf444
+---
+ overlay/frameworks/base/core/res/res/values/config.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
+index 0cdc065..627c91e 100644
+--- a/overlay/frameworks/base/core/res/res/values/config.xml
++++ b/overlay/frameworks/base/core/res/res/values/config.xml
+@@ -22,7 +22,6 @@
+ 	<string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
+ 	<bool name="config_useRoundIcon">true</bool>
+ 
+-	<string name="config_wallpaperCropperPackage">com.android.wallpaperpicker</string>
+ 	<bool name="config_unplugTurnsOnScreen">true</bool>
+ 	<!-- Currently disabled for Android Go
+ 	<integer name="config_multiuserMaximumUsers">4</integer>
+-- 
+2.17.1
+
diff --git a/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch b/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch
new file mode 100644
index 0000000..8412e6d
--- /dev/null
+++ b/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch
@@ -0,0 +1,30 @@
+From 3290062c72effc07ccfd62e2b8ef67f897869b8d Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 5 Sep 2019 02:08:22 +0000
+Subject: [PATCH] vendor_lineage: Log privapp-permissions whitelist violations
+ instead
+
+Change-Id: I49dba61f332253e291a65e79ca70d9a07d45bb07
+---
+ config/common.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/common.mk b/config/common.mk
+index 837e11ef..8dfc372b 100644
+--- a/config/common.mk
++++ b/config/common.mk
+@@ -89,9 +89,9 @@ PRODUCT_COPY_FILES += \
+     vendor/lineage/config/permissions/privapp-permissions-lineage.xml:system/etc/permissions/privapp-permissions-lineage.xml \
+     vendor/lineage/config/permissions/privapp-permissions-cm-legacy.xml:system/etc/permissions/privapp-permissions-cm-legacy.xml
+ 
+-# Enforce privapp-permissions whitelist
++# Log privapp-permissions whitelist violations
+ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+-    ro.control_privapp_permissions=enforce
++    ro.control_privapp_permissions=log
+ 
+ # Hidden API whitelist
+ PRODUCT_COPY_FILES += \
+-- 
+2.17.1
+
diff --git a/README.md b/README.md
index 231ff70..b4c0702 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-Prerequisite: sync [treble_experimentations](https://github.com/phhusson/treble_experimentations) to `~`; sync [treble_patches](https://github.com/AndyCGYan/treble_patches) to `treble_patches` under workspace root
+Prerequisite: sync [treble_experimentations](https://github.com/AndyCGYan/treble_experimentations) to `~`; sync [treble_patches](https://github.com/AndyCGYan/treble_patches) to `treble_patches` under workspace root
diff --git a/build_treble_vanilla.sh b/build_treble_vanilla.sh
index 6a58da1..c99a0da 100644
--- a/build_treble_vanilla.sh
+++ b/build_treble_vanilla.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
 repo sync -c --force-sync --no-clone-bundle --no-tags -j$(nproc --all)
+
+cd frameworks/base
+git revert 817541a8353014e40fa07a1ee27d9d2f35ea2c16 --no-edit #Initial support for in-display fingerprint sensors
+cd ../..
+
 rm -f device/*/sepolicy/common/private/genfs_contexts
 cd device/phh/treble
 git clean -fdx
@@ -24,6 +29,9 @@ cd ..
 cd packages/apps/LineageParts
 git am ../../../0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch
 cd ../../..
+cd vendor/lineage
+git am ../../0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch
+cd ../..
 echo ""
 
 echo "Applying GSI-specific patches"
@@ -34,6 +42,8 @@ cd device/phh/treble
 git revert 82b15278bad816632dcaeaed623b569978e9840d --no-edit #Update lineage.mk for LineageOS 16.0
 git revert df25576594f684ed35610b7cc1db2b72bc1fc4d6 --no-edit #exfat fsck/mkfs selinux label
 git am ../../../0001-treble-Add-overlay-lineage.patch
+git am ../../../0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
+git am ../../../0001-Increase-system-partition-size-for-arm_ab.patch
 cd ../../..
 cd external/tinycompress
 git revert fbe2bd5c3d670234c3c92f875986acc148e6d792 --no-edit #tinycompress: Use generated kernel headers