Changes for August 2021

README.md

@@ -17,11 +17,11 @@ Initialize your LineageOS workspace:
 
 Clone the modified treble patches and this repo:
 
-    git clone https://github.com/AndyCGYan/treble_patches -b lineage-16.0
+    git clone https://github.com/AndyCGYan/treble_patches treble_patches -b lineage-16.0
-    git clone https://github.com/AndyCGYan/treble_build_los -b lineage-16.0
+    git clone https://github.com/AndyCGYan/treble_build_los treble_build_los -b lineage-16.0
 
 Finally, start the build script:
 
     bash treble_build_los/buildbot_treble.sh
 
-Be sure to update the cloned repos from time to time!
+Be sure to update the cloned repos from time to time!

buildbot_treble.sh

@@ -6,6 +6,16 @@ echo "Executing in 5 seconds - CTRL-C to exit"
 echo ""
 sleep 5
 
+# Abort early on error
+set -eE
+trap '(\
+echo;\
+echo \!\!\! An error happened during script execution;\
+echo \!\!\! Please check console output for bad sync,;\
+echo \!\!\! failed patch application, etc.;\
+echo\
+)' ERR
+
 START=`date +%s`
 BUILD_DATE="$(date +%Y%m%d)"
 BL=$PWD/treble_build_los
@@ -25,15 +35,14 @@ echo ""
 
 echo "Applying PHH patches"
 cd frameworks/base
-git revert e0a5469cf5a2345fae7e81d16d717d285acd3a6e --no-edit # FODCircleView: defer removal to next re-layout
+git am $BL/patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch
-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
 bash generate.sh lineage
 cd ../../..
-bash ~/treble_experimentations/apply-patches.sh treble_patches
+bash ~/treble_experimentations/apply-patches.sh treble_patches/patches
 echo ""
 
 echo "Applying universal patches"
@@ -67,6 +76,9 @@ cd ../../..
 cd external/tinycompress
 git revert fbe2bd5c3d670234c3c92f875986acc148e6d792 --no-edit # tinycompress: Use generated kernel headers
 cd ../..
+cd vendor/interfaces
+git revert 0611b67d96f7f7f71b12079a1b345022fe7bd323 --no-edit # Include Samsung Q camera provider
+cd ../..
 cd vendor/lineage
 git am $BL/patches/0001-build_soong-Disable-generated_kernel_headers.patch
 cd ../..

patches/0001-core-Add-support-for-MicroG.patch

@@ -1,4 +1,4 @@
-From 51c79844320ca6dcb8d9c145709f0dc394f3146a Mon Sep 17 00:00:00 2001
+From 89a3a0102026ad3621a89b0f1c3b25eb3ad49329 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 17 May 2019 03:36:35 +0000
 Subject: [PATCH] core: Add support for MicroG
@@ -14,7 +14,7 @@ Change-Id: I0e5a0aca9fccbd4372de8ce3af76c53cc7c35f28
  4 files changed, 35 insertions(+), 2 deletions(-)
 
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 34d26f0da90..08f95ec1fdf 100644
+index af1a6fa9e3c..c9e9daea1ba 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
 @@ -2357,6 +2357,13 @@
@@ -32,7 +32,7 @@ index 34d26f0da90..08f95ec1fdf 100644
           {@link android.content.pm.PackageManager#addPackageToPreferred}
           for details. -->
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index f7b06f98512..703a63ff5f1 100644
+index bd84a6d720b..977ae5cfe10 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -1716,6 +1716,8 @@
@@ -61,12 +61,12 @@ index f6600462ea7..bd96a09684f 100644
      <string name="permlab_statusBar">disable or modify status bar</string>
      <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 9b50a1545a5..f12509e36e7 100644
+index f3938b32333..1b069e34891 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
-@@ -4001,8 +4001,9 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -4063,8 +4063,9 @@ public class PackageManagerService extends IPackageManager.Stub
-             final Set<String> permissions = ArrayUtils.isEmpty(p.requestedPermissions)
+                 });
-                     ? Collections.<String>emptySet() : permissionsState.getPermissions(userId);
+             }
  
 -            PackageInfo packageInfo = PackageParser.generatePackageInfo(p, gids, flags,
 -                    ps.firstInstallTime, ps.lastUpdateTime, permissions, state, userId);
@@ -76,7 +76,7 @@ index 9b50a1545a5..f12509e36e7 100644
  
              if (packageInfo == null) {
                  return null;
-@@ -4038,6 +4039,24 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -4100,6 +4101,24 @@ public class PackageManagerService extends IPackageManager.Stub
          }
      }
  
@@ -102,5 +102,5 @@ index 9b50a1545a5..f12509e36e7 100644
      public void checkPackageStartable(String packageName, int userId) {
          final int callingUid = Binder.getCallingUid();
 -- 
-2.17.1
+2.25.1