200808 v222

  -wip-

README.md

@@ -6,10 +6,10 @@ This is GSI project, patches based on the Phh's works
 apply-patches.sh to apply all patches
 	ex. usage:
 		cd /where/aosp/sources
-		bash ~/files/patches/aosp/v221/apply-patches.sh ~/files/patches/aosp/v221/
+		bash ~/files/patches/aosp/v222/apply-patches.sh ~/files/patches/aosp/v222/
 
 buildCaos.sh for starting build process from zero
 	ex. usage:
-		cd ~/files/patches/aosp/v221
+		cd ~/files/patches/aosp/v222
 		bash buildCaos.sh /where/aosp/sources
 

buildCaos.sh

@@ -11,8 +11,8 @@ fi
 
 pushd "$1"
 
-repo init -u https://android.googlesource.com/platform/manifest -b android-10.0.0_r40
-git clone --single-branch https://github.com/eremitein/treble_manifest_caos -b v221 .repo/local_manifests
+repo init -u https://android.googlesource.com/platform/manifest -b android-10.0.0_r41
+git clone --single-branch https://github.com/eremitein/treble_manifest_caos -b v222 .repo/local_manifests
 repo sync -j${para} -c -q --force-sync --no-tags --no-clone-bundle --optimized-fetch --prune ||exit
 bash ${rund}/apply-patches.sh ${rund}
 cd device/phh/treble

patches/build/0001-rename-to-Messaging.patch

@@ -1,4 +1,4 @@
-From 9e641878de0a64848a4f65939ba05cedf7fd2bb4 Mon Sep 17 00:00:00 2001
+From 47d840d50324f49b84108faf5cddab9658f75d7d Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sun, 8 Dec 2019 13:19:38 +0200
 Subject: [PATCH 01/10] rename to Messaging
@@ -43,5 +43,5 @@ index 7578f92ac..bb0152dcd 100644
      WAPPushManager \
      WallpaperPicker \
 -- 
-2.25.1
+2.17.1
 

patches/build/0002-remove-su-from-none-su-builds-exactly-all.patch

@@ -1,4 +1,4 @@
-From 79b45ec32d573769a1a1772f04ca25bdd0572575 Mon Sep 17 00:00:00 2001
+From bdb1ca34beada562d60c55d9847e9fb0d4888eb3 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 14 Dec 2019 23:46:34 +0200
 Subject: [PATCH 02/10] remove 'su' from none-su builds (exactly, all)
@@ -23,5 +23,5 @@ index 2f8a63472..699b9c7a1 100644
      tracepath \
      tracepath6 \
 -- 
-2.25.1
+2.17.1
 

patches/build/0003-replace-to-Q-Google-sounds.patch

@@ -1,4 +1,4 @@
-From a65c0791d2d2d60297e80bafe716369eb8565fa9 Mon Sep 17 00:00:00 2001
+From 0ef628fd8bce4c6dfd75dceb9712a3b1ca7b9b54 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 8 Feb 2020 16:39:09 +0200
 Subject: [PATCH 03/10] replace to Q Google sounds
@@ -94,5 +94,5 @@ index 7900cdfee..c2623bffe 100644
 
  PRODUCT_PACKAGES += \
 -- 
-2.25.1
+2.17.1
 

patches/build/0004-add-few-Google-s-fonts.patch

@@ -1,4 +1,4 @@
-From f8ead8385baf547be097a9501303bf3a557a2e6a Mon Sep 17 00:00:00 2001
+From 9ca21ce78cfafd2d455ec565e343959e7518e9c2 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 22 Feb 2020 12:06:03 +0200
 Subject: [PATCH 04/10] add few Google's fonts
@@ -27,5 +27,5 @@ index fde431add..5ebceeafe 100644
  $(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)
  $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk)
 -- 
-2.25.1
+2.17.1
 

patches/build/0005-remove-some-apps.patch

@@ -1,4 +1,4 @@
-From c033a0ef278ad459ca55fa76c82851910986b3d3 Mon Sep 17 00:00:00 2001
+From c7881c12098dcbfc9295f670e9294ed67b74b9d3 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 7 Dec 2019 16:38:50 +0200
 Subject: [PATCH 05/10] remove some apps
@@ -58,5 +58,5 @@ index f21fa89c0..63b9af293 100644
    system/bin/healthd \
    system/etc/init/healthd.rc \
 -- 
-2.25.1
+2.17.1
 

patches/build/0006-replace-Gallery2-app.patch

@@ -1,4 +1,4 @@
-From ab012c7739977f044bc0624be480f57987f0f3be Mon Sep 17 00:00:00 2001
+From 14956c2583955008c6822d5c505015c6f5fc16bc Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sun, 29 Dec 2019 17:28:08 +0200
 Subject: [PATCH 06/10] replace Gallery2 app
@@ -46,5 +46,5 @@ index 63b9af293..c19dda6ed 100644
    system/bin/healthd \
    system/etc/init/healthd.rc \
 -- 
-2.25.1
+2.17.1
 

patches/build/0007-add-ExactCalculator.patch

@@ -1,4 +1,4 @@
-From f6fded846e60af448e87c0fcb1eaf80f8a392a4f Mon Sep 17 00:00:00 2001
+From 00ac619dde0a8e1d55b3b9e2ae853b0d3b41ec6b Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sun, 23 Feb 2020 21:04:29 +0200
 Subject: [PATCH 07/10] add ExactCalculator
@@ -21,5 +21,5 @@ index 0fdb1b234..54cca22ec 100644
      Launcher3QuickStep \
      OneTimeInitializer \
 -- 
-2.25.1
+2.17.1
 

patches/build/0008-add-a-lot-of-fonts-v217.patch

@@ -1,4 +1,4 @@
-From f69f9ab3e92cb4f02d5b6ba53d7f2e26e7b3248d Mon Sep 17 00:00:00 2001
+From 65a459c896cf5b66371ac5fefde8d1611b376021 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Thu, 9 Apr 2020 05:32:23 +0300
 Subject: [PATCH 08/10] add a lot of fonts v217
@@ -37,5 +37,5 @@ index 5ebceeafe..a0ed1ae78 100644
  $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
  $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
 -- 
-2.25.1
+2.17.1
 

patches/build/0010-replace-Calendar-with-Etar.patch → patches/build/0009-replace-Calendar-with-Etar.patch

@@ -1,7 +1,7 @@
-From f7a5cb92753b87199cf0c14217ae7e42d6e68617 Mon Sep 17 00:00:00 2001
+From 80e6f517f0b9a7a3cc4a0350c9a6deccda91b666 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Tue, 7 Jul 2020 21:01:41 +0300
-Subject: [PATCH 10/10] replace Calendar with Etar
+Subject: [PATCH 09/10] replace Calendar with Etar
 
 ---
  target/product/handheld_product.mk | 2 +-
@@ -39,5 +39,5 @@ index c19dda6ed..889fee5c3 100644
    system/app/LatinIME/oat/arm64/LatinIME.odex \
    system/app/LatinIME/oat/arm64/LatinIME.vdex \
 -- 
-2.25.1
+2.17.1
 

patches/build/0009-set-DEXPREOPT_SPEED-for-systemUI-launcher.patch → patches/build/0010-set-DEXPREOPT_SPEED-for-SystemUI.patch

@@ -1,28 +1,27 @@
-From 8aa4baf4cc6e7b78de848ee6de9f8d7e51d1a527 Mon Sep 17 00:00:00 2001
+From 9962f012651b26252474a2d966cee5abacae560f Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 23 May 2020 19:50:13 +0300
-Subject: [PATCH 09/10] set DEXPREOPT_SPEED for systemUI & launcher
+Subject: [PATCH 10/10] set DEXPREOPT_SPEED for SystemUI
 
 	modified:   target/product/base_system.mk
 ---
- target/product/base_system.mk | 4 ++++
- 1 file changed, 4 insertions(+)
+ target/product/base_system.mk | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/target/product/base_system.mk b/target/product/base_system.mk
-index 699b9c7a1..e6bc88ded 100644
+index 699b9c7a1..c9633132e 100644
 --- a/target/product/base_system.mk
 +++ b/target/product/base_system.mk
-@@ -374,6 +374,10 @@ PRODUCT_SYSTEM_SERVER_APPS += \
+@@ -374,6 +374,9 @@ PRODUCT_SYSTEM_SERVER_APPS += \
      SettingsProvider \
      WallpaperBackup
 
 +PRODUCT_DEXPREOPT_SPEED_APPS += \
-+    Launcher3QuickStep \
 +    SystemUI
 +
  # Packages included only for eng/userdebug builds, when building with SANITIZE_TARGET=address
  PRODUCT_PACKAGES_DEBUG_ASAN := \
      fuzz \
 -- 
-2.25.1
+2.17.1
 

patches/device_phh_treble/0001-base-add-secure-file-to-the-system-image.patch

@@ -1,15 +1,15 @@
-From cc4466c85ac51d618d43cd2ad2dfc713c661f604 Mon Sep 17 00:00:00 2001
+From 40b56a3bf63be980334130b8c2e07c420f0c076e Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Wed, 25 Dec 2019 12:34:05 +0200
-Subject: [PATCH 1/8] base: add "secure" file to the system image
+Subject: [PATCH 1/9] base: add "secure" file to the system image
 
 	modified:   base.mk
 ---
  base.mk | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/base.mk b/base.mk
-index 28325b4..5645c14 100644
+index cad14e4..93fc30e 100644
 --- a/base.mk
 +++ b/base.mk
 @@ -63,6 +63,7 @@ PRODUCT_COPY_FILES += \
@@ -21,5 +21,5 @@ index 28325b4..5645c14 100644
 
  PRODUCT_PACKAGES += \
 -- 
-2.25.1
+2.17.1
 

patches/device_phh_treble/0002-selinux-allow-system_app-read-selinux-status-for-get.patch

@@ -1,7 +1,7 @@
-From b3a6764bb9df9ffd32202e02e98cd36d9caf1804 Mon Sep 17 00:00:00 2001
+From 2ffeab66915afadd494f773f610df8d26cdb4f0b Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 11 Jan 2020 13:17:06 +0200
-Subject: [PATCH 2/8] selinux: allow system_app read selinux status (for
+Subject: [PATCH 2/9] selinux: allow system_app read selinux status (for
  getenforce)
 
 	new file:   sepolicy/getenforce.te
@@ -21,5 +21,5 @@ index 0000000..3ef0c48
 +# tcontext=u:object_r:selinuxfs:s0 tclass=file permissive=0
 +allow system_app selinuxfs:file r_file_perms;
 -- 
-2.25.1
+2.17.1
 

patches/device_phh_treble/0003-rw-system-set-LTE-by-default-for-daisy.patch

@@ -1,18 +1,18 @@
-From bf708918e833338dacf1fe3f866b2c4f3d2a4f8b Mon Sep 17 00:00:00 2001
+From ae75805a046ae8e3c54dfa432eab8e37a4d56623 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 11 Jan 2020 17:31:17 +0200
-Subject: [PATCH 3/8] rw-system: set LTE by default for 'daisy'
+Subject: [PATCH 3/9] rw-system: set LTE by default for 'daisy'
 
 	modified:   rw-system.sh
 ---
  rw-system.sh | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index 2407471..2c71cd5 100644
+index 98b1a0a..dcdf5de 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -429,6 +429,9 @@ fi
+@@ -437,6 +437,9 @@ fi
  if getprop ro.vendor.build.fingerprint | grep -iq -e xiaomi/daisy; then
      setprop debug.sf.latch_unsignaled 1
      setprop debug.sf.enable_hwc_vds 1
@@ -23,5 +23,5 @@ index 2407471..2c71cd5 100644
 
  if getprop ro.vendor.build.fingerprint | grep -iq -E -e 'huawei|honor' || getprop persist.sys.overlay.huawei | grep -iq -E -e 'true'; then
 -- 
-2.25.1
+2.17.1
 

patches/device_phh_treble/0004-rw-system-implement-build.version.security_patch-pro.patch

@@ -1,18 +1,18 @@
-From 1a37adbe2707977d88c7a2ef8088c9e69c2d11dc Mon Sep 17 00:00:00 2001
+From d608b39089817788131f9ed8ea6fe7b03fbf0359 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Wed, 5 Feb 2020 15:41:12 +0200
-Subject: [PATCH 4/8] rw-system: implement build.version.security_patch prop
+Subject: [PATCH 4/9] rw-system: implement build.version.security_patch prop
 
 	modified:   rw-system.sh
 ---
  rw-system.sh | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/rw-system.sh b/rw-system.sh
-index 2c71cd5..3eba79d 100644
+index dcdf5de..3078c4e 100644
 --- a/rw-system.sh
 +++ b/rw-system.sh
-@@ -578,6 +578,7 @@ if [ -f /system/phh/secure ];then
+@@ -586,6 +586,7 @@ if [ -f /system/phh/secure ];then
      copyprop ro.product.manufacturer ro.vendor.product.manufacturer
      copyprop ro.system.product.manufacturer ro.product.vendor.manufacturer
      copyprop ro.product.manufacturer ro.product.vendor.manufacturer
@@ -21,5 +21,5 @@ index 2c71cd5..3eba79d 100644
          [ -n "$v" ] && resetprop ro.build.version.security_patch "$v"
      done
 -- 
-2.25.1
+2.17.1
 

patches/device_phh_treble/0005-base-add-7z-ntfs-3g-vim.patch

@@ -1,18 +1,18 @@
-From 7fe1607e15e05d8cd48d2255acafe0508399d28a Mon Sep 17 00:00:00 2001
+From b87cce2c6aad6d445a24d988d900a08b2bfda4c5 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 8 Feb 2020 21:58:07 +0200
-Subject: [PATCH 5/8] base: add 7z, ntfs-3g & vim
+Subject: [PATCH 5/9] base: add 7z, ntfs-3g & vim
 
 	modified:   base.mk
 ---
  base.mk | 19 ++++++++++++++-----
  1 file changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/base.mk b/base.mk
-index 5645c14..4b7251e 100644
+index 93fc30e..63adc7c 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -128,11 +128,11 @@ SELINUX_IGNORE_NEVERALLOWS := true
+@@ -130,11 +130,11 @@ SELINUX_IGNORE_NEVERALLOWS := true
 
  # Universal NoCutoutOverlay
  PRODUCT_PACKAGES += \
@@ -27,7 +27,7 @@ index 5645c14..4b7251e 100644
 
  PRODUCT_COPY_FILES += \
  	device/phh/treble/files/adbd.rc:system/etc/init/adbd.rc
-@@ -162,10 +162,19 @@ PRODUCT_COPY_FILES += \
+@@ -164,10 +164,19 @@ PRODUCT_COPY_FILES += \
  	frameworks/native/data/etc/android.software.secure_lock_screen.xml:system/etc/permissions/android.software.secure_lock_screen.xml \
 
  PRODUCT_COPY_FILES += \
@@ -50,5 +50,5 @@ index 5645c14..4b7251e 100644
  # Privapp-permissions whitelist for PhhTrebleApp
  PRODUCT_COPY_FILES += \
 -- 
-2.25.1
+2.17.1
 

patches/device_phh_treble/0006-add-caos-bootanimation.patch

@@ -1,7 +1,7 @@
-From 9d17df39273dccd77c8e5d5151c1d2b7009840d0 Mon Sep 17 00:00:00 2001
+From 57c1f1ef80ace740324df62bc4fb53c40181a011 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sun, 24 May 2020 09:16:59 +0300
-Subject: [PATCH 6/8] add caos bootanimation
+Subject: [PATCH 6/9] add caos bootanimation
 
 ---
  base.mk                |   3 +++
@@ -10,10 +10,10 @@ Subject: [PATCH 6/8] add caos bootanimation
  create mode 100644 bootanimation_caos.zip
 
 diff --git a/base.mk b/base.mk
-index 4b7251e..c3f8bcd 100644
+index 63adc7c..3ccda6f 100644
 --- a/base.mk
 +++ b/base.mk
-@@ -176,6 +176,9 @@ PRODUCT_PACKAGES += \
+@@ -178,6 +178,9 @@ PRODUCT_PACKAGES += \
  	mount.ntfs \
  	vim
 
@@ -145,5 +145,5 @@ literal 0
 HcmV?d00001
 
 -- 
-2.25.1
+2.17.1
 

patches/device_phh_treble/0007-rework-gapps-go.patch

@@ -1,7 +1,7 @@
-From 27589394a3753d83a6fa1c5a9f0b64fb0bf4f15e Mon Sep 17 00:00:00 2001
+From 736b034c859992651c2e0536e7dd0508aa372e50 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Wed, 27 May 2020 05:57:53 +0300
-Subject: [PATCH 7/8] rework gapps & go
+Subject: [PATCH 7/9] rework gapps & go
 
 ---
  gapps.mk             |  1 -
@@ -60,5 +60,5 @@ index 813d66b..d50ee9d 100644
  	GmsSampleIntegrationGo \
  	GmsSampleIntegrationGo2GB \
 -- 
-2.25.1
+2.17.1