From 39a015c55a036f45ce858b1d1865f8be13e09f69 Mon Sep 17 00:00:00 2001
From: Tavi <tavi@divested.dev>
Date: Mon, 17 Jun 2024 02:18:04 -0400
Subject: [PATCH] Fixups + Churn

Signed-off-by: Tavi <tavi@divested.dev>
---
 Logs/resetWorkspace-LineageOS-18.1.txt        |  4 +--
 Logs/resetWorkspace-LineageOS-19.1.txt        |  8 +++---
 .../0013-Network_Permission-1.patch           |  4 +--
 .../0013-Sensors_Permission.patch             |  4 +--
 .../0013-Special_Permissions.patch            | 16 ++++++------
 .../android_frameworks_base/394553.patch      |  6 ++---
 .../android_frameworks_base/394554.patch      |  6 ++---
 .../android_frameworks_base/394555.patch      | 12 ++++-----
 .../android_frameworks_base/394556.patch      | 26 +++++++++----------
 .../android_frameworks_base/394557.patch      | 10 +++----
 .../android_frameworks_base/394558.patch      |  6 ++---
 .../android_frameworks_base/394559.patch      |  8 +++---
 .../android_frameworks_base/394560.patch      |  8 +++---
 .../android_frameworks_base/394561.patch      |  8 +++---
 .../android_frameworks_base/394562.patch      |  8 +++---
 .../android_frameworks_base/394563.patch      | 10 +++----
 .../330099.patch                              |  6 ++---
 .../0013-Network_Permission-1.patch           |  4 +--
 .../0013-Sensors_Permission.patch             |  4 +--
 .../0013-Special_Permissions-2.patch          | 12 ++++-----
 .../0013-Special_Permissions.patch            | 16 ++++++------
 .../0002-Tor_Support.patch                    |  6 ++---
 .../0003-Server_Choices.patch                 |  6 ++---
 Scripts/Common/Fix_CVE_Patchers.sh            |  2 +-
 .../android_kernel_samsung_universal8890.sh   |  2 +-
 .../android_kernel_google_dragon.sh           |  2 +-
 .../android_kernel_zte_msm8996.sh             |  2 +-
 .../android_kernel_google_marlin.sh           |  4 +--
 .../android_kernel_motorola_msm8996.sh        |  4 +--
 .../android_kernel_oneplus_msm8996.sh         |  4 +--
 30 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/Logs/resetWorkspace-LineageOS-18.1.txt b/Logs/resetWorkspace-LineageOS-18.1.txt
index 95c1b522..5d6ac93e 100644
--- a/Logs/resetWorkspace-LineageOS-18.1.txt
+++ b/Logs/resetWorkspace-LineageOS-18.1.txt
@@ -135,7 +135,7 @@ external/cblas d82c5f4ae14b2a5468303985070f7dadc15d4094
 external/cbor-java f81e576298790c97498311e99a0b0b34653c3dd8
 external/chromium-libpac 169c93e00a00605346a68d39d3f4713735bdb61e
 external/chromium-trace e524766cad26d677a9a1ec8c00c512d4cac2cf5e
-external/chromium-webview 18024297bc95fb233a92b15d8bf26c9b987bda66
+external/chromium-webview b796168b7ca30f621e1c85271044bd56d74bde23
 external/clang 0a1c53a5d295109bd4702ad13c0f2a5510ca1b26
 external/cldr 38850463abd624d5b2293be75fddc43cf6b55ae2
 external/cn-cbor 696530332036f5518681d3c450cdbc3ee412004a
@@ -858,7 +858,7 @@ tools/loganalysis 915dbf1d7ed0f684d2d1bc3a6be9ef417c93527d
 tools/metalava 21659a2683eed66e16aeafeb8d9c40916946a51b
 tools/ndkports d0ec81e4b134f4b1446d3fd5a6dfbf095475597c
 tools/platform-compat b553fea7dd2aa8dcc26f4d8f91effd86e55dd72e
-tools/repohooks 6ca9412c1ba65e255924a403165d60949bfebd50
+tools/repohooks eee438b68bc9c55036016d681269ee8c261c94ff
 tools/security a5c3644bd83674858e0b9d5da3e6014a3cbf3ba6
 tools/test/connectivity 38ccb70b61038b0be21da87ae626b01a3d162bf8
 tools/test/graphicsbenchmark 7c31a9c1f32d602e1b50446951088d3beddedb84
diff --git a/Logs/resetWorkspace-LineageOS-19.1.txt b/Logs/resetWorkspace-LineageOS-19.1.txt
index d1bb3070..18036aa2 100644
--- a/Logs/resetWorkspace-LineageOS-19.1.txt
+++ b/Logs/resetWorkspace-LineageOS-19.1.txt
@@ -5,7 +5,7 @@ bootable/libbootloader b44eeefd365e023a96ea36682cc60b46827a47cc
 bootable/recovery 7c1eb300fbcf789024da690c96adb167d31aa5a5
 build/bazel f3015c3bbd520d95216123e6761a2860e17acebf
 build/blueprint c24408d5ae37cbcbec15205a02812b7d6c563b90
-build/make b7fd9639201c3842d7e0d91e4c303dc92df6fe4f
+build/make 722c54d2ddc48d914e10769348ae4381b4f47427
 build/pesto 0f35caa8191635ace102f6d8c96318c5ed52dfe3
 build/soong 59d5b37cce358e0d300392676d64191d3938608f
 compatibility/cdd 43611a0b6d2c62ae1d08d951fccf8f2ab8dc60c6
@@ -94,7 +94,7 @@ external/catch2 2b2e0e9540defee10f28ea0fc97750490fa238b5
 external/cblas 2b24922070cb6d45edd5f5b533db0637099a2b17
 external/cbor-java 00c4a382dd3810f9c1b363eaad339cff34a3f6fe
 external/chromium-trace 138ade68f9d3388a1b0a6d9ce5e091ff6f7e7448
-external/chromium-webview 18024297bc95fb233a92b15d8bf26c9b987bda66
+external/chromium-webview b796168b7ca30f621e1c85271044bd56d74bde23
 external/clang f1cef8e77ae220c9379303bdc9896e0c2366bd6f
 external/cldr 242ecd0dcb21f3376f825119ec0b36fcb15e7bb8
 external/cn-cbor 6a0f6a5375b8cd9b495e91c11d21ed257ec9a905
@@ -875,7 +875,7 @@ packages/apps/Traceur b5e983189ce82742037f76e3ae1340e4cb74d80e
 packages/apps/Trebuchet 660a409e818d44701af28669cc2e42acb316d267
 packages/apps/TvSettings f8fb67eccca677e57c96a872c032c131b04d0409
 packages/apps/UniversalMediaPlayer 3a912bc775d662a075ed7c8d278e77d780c57213
-packages/apps/Updater fbeda0aa43cd7053a2dcab70a9dc964ad135cd3d
+packages/apps/Updater 1546e90f1a619a39b384267d845a0b57d42e9c50
 packages/apps/WallpaperPicker2 ee2174f46338aca760e6ce61235cca191619be74
 packages/inputmethods/LatinIME 59669cfd005f1827c8096c6ac60a7df28af1cd31
 packages/inputmethods/LeanbackIME 3aa34644aff68909411087d79e4fc07406be6ca5
@@ -1082,7 +1082,7 @@ tools/extract-utils c12d3941893a6d1187986d85be04308104d13269
 tools/metalava 0d8be7040dceaf9b084e909b6907e463ab7d3237
 tools/ndkports a181fe59a34803a1ba7300bd1a32532b6dc3e9fb
 tools/platform-compat cfa5a189e9671992ba7ad5b8de5d59826544a592
-tools/repohooks 6ca9412c1ba65e255924a403165d60949bfebd50
+tools/repohooks eee438b68bc9c55036016d681269ee8c261c94ff
 tools/security 4af6777ed4b7a9c09508a600349e0e548174361f
 tools/test/connectivity a74e9d3afee07e92cc9f74345f91ea7cbe29d44d
 tools/test/graphicsbenchmark 6404f16911f96d9253847c1390fd81f1923954cd
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch b/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch
index 0458e0e5..a563d5d7 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch
@@ -23,10 +23,10 @@ index eb64db7493cc..31b960716b4b 100644
      <!-- Allows applications to access information about networks.
           <p>Protection level: normal
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index e827b7616a10..92de1b844efa 100644
+index 0320c4b20c93..374fa4ea084e 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -2649,7 +2649,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2650,7 +2650,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
      }
  
      public static boolean isSpecialRuntimePermission(final String permission) {
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch b/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch
index 85ea9c22..169fd468 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch
@@ -128,10 +128,10 @@ index 189544f98594..9badc8c4d9c0 100644
      field public static final String SENSORS = "android.permission-group.SENSORS";
      field public static final String SMS = "android.permission-group.SMS";
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index 92de1b844efa..499e5b199554 100644
+index 374fa4ea084e..182679b779e9 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -2649,7 +2649,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2650,7 +2650,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
      }
  
      public static boolean isSpecialRuntimePermission(final String permission) {
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch b/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch
index 4afdcb6d..ba5c7f7f 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch
@@ -17,10 +17,10 @@ As a result, PackageManagerService is no longer modified.
  1 file changed, 19 insertions(+), 5 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index f83c3d5145cc..e827b7616a10 100644
+index eb27a13523ba..0320c4b20c93 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -1461,7 +1461,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1462,7 +1462,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
          // to keep the review required permission flag per user while an
          // install permission's state is shared across all users.
          if (pkg.getTargetSdkVersion() < Build.VERSION_CODES.M
@@ -29,7 +29,7 @@ index f83c3d5145cc..e827b7616a10 100644
              return;
          }
  
-@@ -1513,7 +1513,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1514,7 +1514,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                      + permName + " for package " + packageName);
          }
  
@@ -39,7 +39,7 @@ index f83c3d5145cc..e827b7616a10 100644
              Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
              return;
          }
-@@ -1623,7 +1624,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1624,7 +1625,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
          // to keep the review required permission flag per user while an
          // install permission's state is shared across all users.
          if (pkg.getTargetSdkVersion() < Build.VERSION_CODES.M
@@ -48,7 +48,7 @@ index f83c3d5145cc..e827b7616a10 100644
              return;
          }
  
-@@ -1847,7 +1848,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1848,7 +1849,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
  
              // If this permission was granted by default or role, make sure it is.
              if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0
@@ -58,7 +58,7 @@ index f83c3d5145cc..e827b7616a10 100644
                  // PermissionPolicyService will handle the app op for runtime permissions later.
                  grantRuntimePermissionInternal(permName, packageName, false,
                          Process.SYSTEM_UID, userId, delayingPermCallback);
-@@ -2646,6 +2648,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2647,6 +2649,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
          }
      }
  
@@ -69,7 +69,7 @@ index f83c3d5145cc..e827b7616a10 100644
      /**
       * Restore the permission state for a package.
       *
-@@ -2998,6 +3004,14 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2999,6 +3005,14 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                                              }
                                          }
                                      }
@@ -84,7 +84,7 @@ index f83c3d5145cc..e827b7616a10 100644
                                  } else {
                                      if (permState == null) {
                                          // New permission
-@@ -3960,7 +3974,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -3961,7 +3975,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                      && (grantedPermissions == null
                             || ArrayUtils.contains(grantedPermissions, permission))) {
                  final int flags = permissionsState.getPermissionFlags(permission, userId);
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394553.patch b/Patches/LineageOS-18.1/android_frameworks_base/394553.patch
index e70bea70..41f7f173 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394553.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394553.patch
@@ -1,4 +1,4 @@
-From 00961ad29e26dde5d4f56de90ac333ceb2fc8d34 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jing Ji <jji@google.com>
 Date: Tue, 25 Oct 2022 22:39:52 -0700
 Subject: [PATCH] DO NOT MERGE: ActivityManager#killBackgroundProcesses can
@@ -19,10 +19,10 @@ Change-Id: I41cd6fa1f71e950db18a9fd450355c4e6f80ec7d
  1 file changed, 16 insertions(+)
 
 diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index 234b23a996267..815ddf63e565a 100644
+index 234b23a99626..815ddf63e565 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -4486,6 +4486,22 @@ void killAllBackgroundProcessesExcept(int minTargetSdk, int maxProcState) {
+@@ -4486,6 +4486,22 @@ public class ActivityManagerService extends IActivityManager.Stub
              throw new SecurityException(msg);
          }
  
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394554.patch b/Patches/LineageOS-18.1/android_frameworks_base/394554.patch
index 73255325..8453a51e 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394554.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394554.patch
@@ -1,4 +1,4 @@
-From 14804676d97278009b746073e8339374b0cce927 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jing Ji <jji@google.com>
 Date: Thu, 19 Oct 2023 14:22:58 -0700
 Subject: [PATCH] DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses
@@ -18,10 +18,10 @@ Change-Id: I9471a77188ee63ec32cd0c81569193e4ccad885b
  1 file changed, 16 deletions(-)
 
 diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index 815ddf63e565a..234b23a996267 100644
+index 815ddf63e565..234b23a99626 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -4486,22 +4486,6 @@ void killAllBackgroundProcessesExcept(int minTargetSdk, int maxProcState) {
+@@ -4486,22 +4486,6 @@ public class ActivityManagerService extends IActivityManager.Stub
              throw new SecurityException(msg);
          }
  
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394555.patch b/Patches/LineageOS-18.1/android_frameworks_base/394555.patch
index fcc9da32..c8fa2fb8 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394555.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394555.patch
@@ -1,4 +1,4 @@
-From 179a5a7b48c4ec3ffebbf53b9833f6be6ef4e2b1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Valentin Iftime <valiiftime@google.com>
 Date: Thu, 1 Feb 2024 13:58:49 +0100
 Subject: [PATCH] Verify URI permission for channel sound update from
@@ -19,10 +19,10 @@ Change-Id: Ic7d2e96e43565e98d2aa29b8f2ba35c142387ba9
  2 files changed, 89 insertions(+)
 
 diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
-index dfc9c135c7da7..40f6ed45174e2 100755
+index dfc9c135c7da..40f6ed45174e 100755
 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java
 +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
-@@ -5151,6 +5151,10 @@ public void updateNotificationChannelFromPrivilegedListener(INotificationListene
+@@ -5151,6 +5151,10 @@ public class NotificationManagerService extends SystemService {
              Objects.requireNonNull(user);
  
              verifyPrivilegedListener(token, user, false);
@@ -33,7 +33,7 @@ index dfc9c135c7da7..40f6ed45174e2 100755
              updateNotificationChannelInt(pkg, getUidForPackageAndUser(pkg, user), channel, true);
          }
  
-@@ -5230,6 +5234,24 @@ private void verifyPrivilegedListener(INotificationListener token, UserHandle us
+@@ -5230,6 +5234,24 @@ public class NotificationManagerService extends SystemService {
              }
          }
  
@@ -59,10 +59,10 @@ index dfc9c135c7da7..40f6ed45174e2 100755
              int uid = 0;
              long identity = Binder.clearCallingIdentity();
 diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
-index 011c408492fa3..a1d6b56ff9cdb 100755
+index 011c408492fa..a1d6b56ff9cd 100755
 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
 +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
-@@ -2664,6 +2664,73 @@ public void testUpdateNotificationChannelFromPrivilegedListener_badUser() throws
+@@ -2664,6 +2664,73 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
                  eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED));
      }
  
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394556.patch b/Patches/LineageOS-18.1/android_frameworks_base/394556.patch
index 204335d0..f16d1b32 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394556.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394556.patch
@@ -1,4 +1,4 @@
-From 1ac8480b3163815253b07d5e2ffa5ae3d5065a07 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Valentin Iftime <valiiftime@google.com>
 Date: Thu, 22 Feb 2024 10:51:58 +0100
 Subject: [PATCH] Check for NLS bind permission when rebinding services
@@ -19,7 +19,7 @@ Change-Id: I11901755ec430c6e3145def9d67e4e63cda00806
  2 files changed, 139 insertions(+), 23 deletions(-)
 
 diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
-index a604625460a77..e5686dc3f0759 100644
+index a604625460a7..e5686dc3f075 100644
 --- a/services/core/java/com/android/server/notification/ManagedServices.java
 +++ b/services/core/java/com/android/server/notification/ManagedServices.java
 @@ -150,7 +150,9 @@ abstract public class ManagedServices {
@@ -33,7 +33,7 @@ index a604625460a77..e5686dc3f0759 100644
  
      // True if approved services are stored in xml, not settings.
      private boolean mUseXml;
-@@ -761,6 +763,23 @@ protected boolean isPackageOrComponentAllowed(String pkgOrComponent, int userId)
+@@ -761,6 +763,23 @@ abstract public class ManagedServices {
          return false;
      }
  
@@ -57,7 +57,7 @@ index a604625460a77..e5686dc3f0759 100644
      protected boolean isPackageAllowed(String pkg, int userId) {
          if (pkg == null) {
              return false;
-@@ -811,6 +830,7 @@ public void onPackagesChanged(boolean removingPackage, String[] pkgList, int[] u
+@@ -811,6 +830,7 @@ abstract public class ManagedServices {
                      for (int uid : uidList) {
                          if (isPackageAllowed(pkgName, UserHandle.getUserId(uid))) {
                              anyServicesInvolved = true;
@@ -65,7 +65,7 @@ index a604625460a77..e5686dc3f0759 100644
                          }
                      }
                  }
-@@ -938,8 +958,7 @@ protected void setComponentState(ComponentName component, boolean enabled) {
+@@ -938,8 +958,7 @@ abstract public class ManagedServices {
              for (int i = 0; i < userIds.size(); i++) {
                  final int userId = userIds.get(i);
                  if (enabled) {
@@ -75,7 +75,7 @@ index a604625460a77..e5686dc3f0759 100644
                          registerServiceLocked(component, userId);
                      } else {
                          Slog.d(TAG, component + " no longer has permission to be bound");
-@@ -1078,6 +1097,33 @@ private boolean removeUninstalledItemsFromApprovedLists(int uninstalledUserId, S
+@@ -1078,6 +1097,33 @@ abstract public class ManagedServices {
          return removed;
      }
  
@@ -109,7 +109,7 @@ index a604625460a77..e5686dc3f0759 100644
      protected String getPackageName(String packageOrComponent) {
          final ComponentName component = ComponentName.unflattenFromString(packageOrComponent);
          if (component != null) {
-@@ -1237,26 +1283,20 @@ private void bindToServices(SparseArray<Set<ComponentName>> componentsToBind) {
+@@ -1237,26 +1283,20 @@ abstract public class ManagedServices {
              final int userId = componentsToBind.keyAt(i);
              final Set<ComponentName> add = componentsToBind.get(userId);
              for (ComponentName component : add) {
@@ -149,7 +149,7 @@ index a604625460a77..e5686dc3f0759 100644
              }
          }
      }
-@@ -1270,6 +1310,15 @@ private void registerService(final ComponentName name, final int userid) {
+@@ -1270,6 +1310,15 @@ abstract public class ManagedServices {
          }
      }
  
@@ -165,7 +165,7 @@ index a604625460a77..e5686dc3f0759 100644
      /**
       * Inject a system service into the management list.
       */
-@@ -1370,7 +1419,7 @@ public void onBindingDied(ComponentName name) {
+@@ -1370,7 +1419,7 @@ abstract public class ManagedServices {
                              mHandler.postDelayed(new Runnable() {
                                      @Override
                                      public void run() {
@@ -174,7 +174,7 @@ index a604625460a77..e5686dc3f0759 100644
                                      }
                                 }, ON_BINDING_DIED_REBIND_DELAY_MS);
                          } else {
-@@ -1502,6 +1551,19 @@ private void unbindService(ServiceConnection connection, ComponentName component
+@@ -1502,6 +1551,19 @@ abstract public class ManagedServices {
          }
      }
  
@@ -195,10 +195,10 @@ index a604625460a77..e5686dc3f0759 100644
          public IInterface service;
          public ComponentName component;
 diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java
-index 99433a6603c91..e7187f393751d 100644
+index 99433a6603c9..e7187f393751 100644
 --- a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java
 +++ b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java
-@@ -27,8 +27,10 @@
+@@ -27,8 +27,10 @@ import static org.mockito.ArgumentMatchers.anyString;
  import static org.mockito.Matchers.any;
  import static org.mockito.Matchers.anyInt;
  import static org.mockito.Matchers.eq;
@@ -209,7 +209,7 @@ index 99433a6603c91..e7187f393751d 100644
  import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
-@@ -775,6 +777,58 @@ public void testUpgradeAppBindsNewServices() throws Exception {
+@@ -775,6 +777,58 @@ public class ManagedServicesTest extends UiServiceTestCase {
          }
      }
  
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394557.patch b/Patches/LineageOS-18.1/android_frameworks_base/394557.patch
index fbaddc8f..c2db7acd 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394557.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394557.patch
@@ -1,4 +1,4 @@
-From 47b5cdfc811916e1bfe36f98b83697a2027fc96c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Riddle Hsu <riddlehsu@google.com>
 Date: Tue, 6 Feb 2024 17:19:37 +0800
 Subject: [PATCH] Hide window immediately if itself doesn't run hide animation
@@ -21,10 +21,10 @@ Change-Id: Iafc2b2c2a24d8fc8d147354ef2f0b4afeeb510c5
  2 files changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
-index 7360e3677def6..319b7e88258db 100644
+index 7360e3677def..319b7e88258d 100644
 --- a/services/core/java/com/android/server/wm/WindowState.java
 +++ b/services/core/java/com/android/server/wm/WindowState.java
-@@ -3009,8 +3009,10 @@ boolean hideLw(boolean doAnimation, boolean requestAnim) {
+@@ -3009,8 +3009,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
              return false;
          }
          if (doAnimation) {
@@ -38,10 +38,10 @@ index 7360e3677def6..319b7e88258db 100644
              }
          }
 diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
-index 360d73b5bd872..0bf95eca08f89 100644
+index 360d73b5bd87..0bf95eca08f8 100644
 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
 +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
-@@ -205,6 +205,26 @@ public void testIsOnScreen_hiddenByPolicy() {
+@@ -205,6 +205,26 @@ public class WindowStateTests extends WindowTestsBase {
          assertTrue(window.isOnScreen());
          window.hideLw(false /* doAnimation */);
          assertFalse(window.isOnScreen());
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394558.patch b/Patches/LineageOS-18.1/android_frameworks_base/394558.patch
index f8a565a8..f35b8bcd 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394558.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394558.patch
@@ -1,4 +1,4 @@
-From 80a45f078fcf1b7157535dcbf07d210ac2c7cd82 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Yi-an Chen <theianchen@google.com>
 Date: Tue, 20 Feb 2024 04:34:57 +0000
 Subject: [PATCH] Fix error handling for non-dynamic permissions
@@ -18,10 +18,10 @@ Change-Id: I7336f2fc78804f26e4b2a329870ecdea776595d8
  1 file changed, 1 insertion(+)
 
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index f83c3d5145cc7..eb27a13523baf 100644
+index f83c3d5145cc..eb27a13523ba 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -645,6 +645,7 @@ public void removePermission(String permName) {
+@@ -645,6 +645,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                  // TODO: switch this back to SecurityException
                  Slog.wtf(TAG, "Not allowed to modify non-dynamic permission "
                          + permName);
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394559.patch b/Patches/LineageOS-18.1/android_frameworks_base/394559.patch
index 724fb031..0d2e84e2 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394559.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394559.patch
@@ -1,4 +1,4 @@
-From 18d1359a28cee22491dbe2f8b814ab999348ebfa Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Dmitry Dementyev <dementyev@google.com>
 Date: Tue, 26 Mar 2024 10:31:44 -0700
 Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
@@ -14,10 +14,10 @@ Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
  1 file changed, 10 insertions(+)
 
 diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
-index 8a9ddda50d63b..37a68d3eec76c 100644
+index 8a9ddda50d63..37a68d3eec76 100644
 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
 +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
-@@ -3475,6 +3475,11 @@ public void onResult(Bundle result) {
+@@ -3475,6 +3475,11 @@ public class AccountManagerService
  
              // Strip auth token from result.
              result.remove(AccountManager.KEY_AUTHTOKEN);
@@ -29,7 +29,7 @@ index 8a9ddda50d63b..37a68d3eec76c 100644
  
              if (Log.isLoggable(TAG, Log.VERBOSE)) {
                  Log.v(TAG,
-@@ -5052,6 +5057,11 @@ public void onResult(Bundle result) {
+@@ -5052,6 +5057,11 @@ public class AccountManagerService
                      } else {
                          if (mStripAuthTokenFromResult) {
                              result.remove(AccountManager.KEY_AUTHTOKEN);
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394560.patch b/Patches/LineageOS-18.1/android_frameworks_base/394560.patch
index 6ed7b5be..d7dbf2ae 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394560.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394560.patch
@@ -1,4 +1,4 @@
-From a0059406f6fa6fa600bd6d5fc488de1d3aa956af Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Haoran Zhang <haoranzhang@google.com>
 Date: Wed, 13 Mar 2024 17:08:00 +0000
 Subject: [PATCH] Add in check for intent filter when setting/updating service
@@ -20,10 +20,10 @@ Change-Id: I51c2e3788ac29ff4d6b86aa2a735ff2ea1463a77
  1 file changed, 27 insertions(+)
 
 diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
-index 57ffe0498a88e..309f78006d4b6 100644
+index 57ffe0498a88..309f78006d4b 100644
 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
 +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
-@@ -32,8 +32,10 @@
+@@ -32,8 +32,10 @@ import android.app.ActivityManagerInternal;
  import android.app.ActivityTaskManager;
  import android.app.IActivityTaskManager;
  import android.content.ComponentName;
@@ -34,7 +34,7 @@ index 57ffe0498a88e..309f78006d4b6 100644
  import android.content.pm.ServiceInfo;
  import android.graphics.Rect;
  import android.metrics.LogMaker;
-@@ -235,6 +237,31 @@ protected boolean updateLocked(boolean disabled) {
+@@ -235,6 +237,31 @@ final class AutofillManagerServiceImpl
      @Override // from PerUserSystemService
      protected ServiceInfo newServiceInfoLocked(@NonNull ComponentName serviceComponent)
              throws NameNotFoundException {
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394561.patch b/Patches/LineageOS-18.1/android_frameworks_base/394561.patch
index 4e8eeb59..12a4c48c 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394561.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394561.patch
@@ -1,4 +1,4 @@
-From a0d6c266c99cdcdba0ef4674cf6995619f13efa7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hans Boehm <hboehm@google.com>
 Date: Tue, 2 Jan 2024 16:53:13 -0800
 Subject: [PATCH] Check hidden API exemptions
@@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
  1 file changed, 10 insertions(+)
 
 diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
-index 39038f555044e..4d69f217c5e6a 100644
+index 39038f555044..4d69f217c5e6 100644
 --- a/core/java/android/os/ZygoteProcess.java
 +++ b/core/java/android/os/ZygoteProcess.java
-@@ -431,6 +431,8 @@ private Process.ProcessStartResult zygoteSendArgsAndGetResult(
+@@ -431,6 +431,8 @@ public class ZygoteProcess {
                  throw new ZygoteStartFailedEx("Embedded newlines not allowed");
              } else if (arg.indexOf('\r') >= 0) {
                  throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");
@@ -30,7 +30,7 @@ index 39038f555044e..4d69f217c5e6a 100644
              }
          }
  
-@@ -980,6 +982,14 @@ private boolean maybeSetApiBlacklistExemptions(ZygoteState state, boolean sendIf
+@@ -980,6 +982,14 @@ public class ZygoteProcess {
              return true;
          }
  
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394562.patch b/Patches/LineageOS-18.1/android_frameworks_base/394562.patch
index 1572b67c..22119bd8 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394562.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394562.patch
@@ -1,4 +1,4 @@
-From 4e6cea9041b540298c7c0a326107532d19a0d997 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ameer Armaly <aarmaly@google.com>
 Date: Fri, 8 Mar 2024 19:41:06 +0000
 Subject: [PATCH] AccessibilityManagerService: remove uninstalled services from
@@ -14,10 +14,10 @@ Change-Id: I5e59296fcad68e62b34c74ee5fd80b6ad6b46fa1
  1 file changed, 22 insertions(+)
 
 diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
-index f9fbda357075d..021ef5567f25a 100644
+index f9fbda357075..021ef5567f25 100644
 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
 +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
-@@ -1612,10 +1612,13 @@ private void updateServicesLocked(AccessibilityUserState userState) {
+@@ -1612,10 +1612,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
          boolean isUnlockingOrUnlocked = LocalServices.getService(UserManagerInternal.class)
                      .isUserUnlockingOrUnlocked(userState.mUserId);
  
@@ -31,7 +31,7 @@ index f9fbda357075d..021ef5567f25a 100644
  
              AccessibilityServiceConnection service = componentNameToServiceMap.get(componentName);
  
-@@ -1664,6 +1667,25 @@ this, mWindowManagerService, getSystemActionPerformer(),
+@@ -1664,6 +1667,25 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
          if (audioManager != null) {
              audioManager.setAccessibilityServiceUids(mTempIntArray);
          }
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/394563.patch b/Patches/LineageOS-18.1/android_frameworks_base/394563.patch
index ab2252ec..cb9d6f4a 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/394563.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/394563.patch
@@ -1,4 +1,4 @@
-From 42515cb6e3148d89efab6fd39537b874a3f29853 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Guojing Yuan <guojing@google.com>
 Date: Thu, 14 Dec 2023 19:30:04 +0000
 Subject: [PATCH] Check permissions for CDM shell commands
@@ -18,10 +18,10 @@ Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
-index 91c2abc024304..275f31f1b6eb0 100644
+index 91c2abc02430..275f31f1b6eb 100644
 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
 +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
-@@ -28,6 +28,7 @@
+@@ -28,6 +28,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna
  import static java.util.concurrent.TimeUnit.MINUTES;
  
  import android.annotation.CheckResult;
@@ -29,7 +29,7 @@ index 91c2abc024304..275f31f1b6eb0 100644
  import android.annotation.Nullable;
  import android.app.AppOpsManager;
  import android.app.PendingIntent;
-@@ -52,11 +53,10 @@
+@@ -52,11 +53,10 @@ import android.os.IBinder;
  import android.os.IDeviceIdleController;
  import android.os.IInterface;
  import android.os.Parcel;
@@ -42,7 +42,7 @@ index 91c2abc024304..275f31f1b6eb0 100644
  import android.os.ShellCommand;
  import android.os.UserHandle;
  import android.os.UserManagerInternal;
-@@ -455,10 +455,12 @@ private void checkUsesFeature(String pkg, int userId) {
+@@ -455,10 +455,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
          }
  
          @Override
diff --git a/Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch b/Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch
index 281d9c46..72f552a4 100644
--- a/Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch
+++ b/Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch
@@ -10,10 +10,10 @@ Change-Id: Ida461cab7f0c4953fbdd6ea4928bf14fff386056
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
-index 37e81d8..dbdc983 100644
+index d6f22d2..e8a0031 100644
 --- a/src/org/lineageos/updater/misc/Constants.java
 +++ b/src/org/lineageos/updater/misc/Constants.java
-@@ -47,6 +47,7 @@ public final class Constants {
+@@ -58,6 +58,7 @@ public final class Constants {
      public static final String PROP_RELEASE_TYPE = "ro.lineage.releasetype";
      public static final String PROP_UPDATER_ALLOW_DOWNGRADING = "lineage.updater.allow_downgrading";
      public static final String PROP_UPDATER_URI = "lineage.updater.uri";
@@ -22,7 +22,7 @@ index 37e81d8..dbdc983 100644
      public static final String PREF_INSTALL_OLD_TIMESTAMP = "install_old_timestamp";
      public static final String PREF_INSTALL_NEW_TIMESTAMP = "install_new_timestamp";
 diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
-index 2b42726..73985da 100644
+index 1577b3d..b295df0 100644
 --- a/src/org/lineageos/updater/misc/Utils.java
 +++ b/src/org/lineageos/updater/misc/Utils.java
 @@ -114,8 +114,9 @@ public class Utils {
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch
index bb36fcf1..ec451225 100644
--- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch
@@ -23,10 +23,10 @@ index c33437d946d8..0526ce1ef25d 100644
      <!-- Allows applications to access information about networks.
           <p>Protection level: normal
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index ff97a3b2e4a8..6686d3750b84 100644
+index fb0167d80fda..1aa703adee58 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -2632,7 +2632,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2633,7 +2633,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
      }
  
      public static boolean isSpecialRuntimePermission(final String permission) {
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch
index 40780821..ce4449eb 100644
--- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch
@@ -99,10 +99,10 @@ index 27c9026c863a..4a8624222ae8 100644
      <string name="permlab_readCalendar">Read calendar events and details</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/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index 6686d3750b84..961d7f050e5d 100644
+index 1aa703adee58..b4240a3a944e 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -2632,7 +2632,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2633,7 +2633,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
      }
  
      public static boolean isSpecialRuntimePermission(final String permission) {
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch
index 155400ef..91147bbf 100644
--- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] extend special runtime permission implementation
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index e4653a899ddd..ff97a3b2e4a8 100644
+index 917a32193409..fb0167d80fda 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -1881,7 +1881,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1882,7 +1882,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
              // permission as requiring a review as this is the initial state.
              final int uid = mPackageManagerInt.getPackageUid(packageName, 0, userId);
              final int targetSdk = mPackageManagerInt.getUidTargetSdkVersion(uid);
@@ -20,7 +20,7 @@ index e4653a899ddd..ff97a3b2e4a8 100644
                      ? FLAG_PERMISSION_REVIEW_REQUIRED | FLAG_PERMISSION_REVOKED_COMPAT
                      : 0;
  
-@@ -2765,7 +2765,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2766,7 +2766,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                                          FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT,
                                          FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT);
                              }
@@ -29,7 +29,7 @@ index e4653a899ddd..ff97a3b2e4a8 100644
                                  uidState.updatePermissionFlags(permission,
                                          PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
                                                  | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT,
-@@ -2855,7 +2855,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2856,7 +2856,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
          //                continue;
          //            }
  
@@ -38,7 +38,7 @@ index e4653a899ddd..ff97a3b2e4a8 100644
                          if (DEBUG_PERMISSIONS) {
                              Log.i(TAG, "Denying runtime-only permission " + bp.getName()
                                      + " for package " + friendlyName);
-@@ -2960,7 +2960,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2961,7 +2961,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                          boolean restrictionApplied = (origState.getPermissionFlags(
                                  bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
  
@@ -47,7 +47,7 @@ index e4653a899ddd..ff97a3b2e4a8 100644
                              // If hard restricted we don't allow holding it
                              if (permissionPolicyInitialized && hardRestricted) {
                                  if (!restrictionExempt) {
-@@ -3044,7 +3044,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -3045,7 +3045,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                                  if (restrictionApplied) {
                                      flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION;
                                      // Dropping restriction on a legacy app implies a review
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions.patch
index 4010e176..7a0c3d68 100644
--- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions.patch
@@ -20,10 +20,10 @@ Signed-off-by: Danny Lin <danny@kdrag0n.dev>
  1 file changed, 20 insertions(+), 5 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index dd8b96eab3d7..e4653a899ddd 100644
+index 31babe0418b8..917a32193409 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-@@ -1525,7 +1525,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1526,7 +1526,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
              // their permissions as always granted runtime ones since we need
              // to keep the review required permission flag per user while an
              // install permission's state is shared across all users.
@@ -33,7 +33,7 @@ index dd8b96eab3d7..e4653a899ddd 100644
                  return;
              }
  
-@@ -1568,7 +1569,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1569,7 +1570,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                              + " for package " + packageName);
                  }
  
@@ -43,7 +43,7 @@ index dd8b96eab3d7..e4653a899ddd 100644
                      Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
                      return;
                  }
-@@ -1693,7 +1695,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1694,7 +1696,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
              // their permissions as always granted runtime ones since we need
              // to keep the review required permission flag per user while an
              // install permission's state is shared across all users.
@@ -53,7 +53,7 @@ index dd8b96eab3d7..e4653a899ddd 100644
                  return;
              }
  
-@@ -1898,7 +1901,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -1899,7 +1902,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
  
              // If this permission was granted by default or role, make sure it is.
              if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0
@@ -63,7 +63,7 @@ index dd8b96eab3d7..e4653a899ddd 100644
                  // PermissionPolicyService will handle the app op for runtime permissions later.
                  grantRuntimePermissionInternal(packageName, permName, false,
                          Process.SYSTEM_UID, userId, delayingPermCallback);
-@@ -2627,6 +2631,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2628,6 +2632,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
          }
      }
  
@@ -74,7 +74,7 @@ index dd8b96eab3d7..e4653a899ddd 100644
      /**
       * Restore the permission state for a package.
       *
-@@ -2995,6 +3003,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2996,6 +3004,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                                      }
                                  }
                              }
@@ -88,7 +88,7 @@ index dd8b96eab3d7..e4653a899ddd 100644
                          } else {
                              if (origPermState == null) {
                                  // New permission
-@@ -3818,7 +3833,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -3819,7 +3834,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
              if (shouldGrantPermission) {
                  final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission,
                          myUid, userId);
diff --git a/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch b/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch
index 0990ef3b..4612fc2b 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch
@@ -52,10 +52,10 @@ index c586f44..b1536ea 100644
          android:id="@+id/preferences_auto_delete_updates"
          android:layout_width="match_parent"
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index bfb2627..916e1e6 100644
+index 1bf6259..81070f8 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -70,6 +70,7 @@
+@@ -79,6 +79,7 @@
      <string name="menu_auto_updates_check_interval_weekly">Once a week</string>
      <string name="menu_auto_updates_check_interval_monthly">Once a month</string>
      <string name="menu_auto_updates_check_interval_never">Never</string>
@@ -63,7 +63,7 @@ index bfb2627..916e1e6 100644
      <string name="menu_auto_delete_updates">Delete updates when installed</string>
      <string name="menu_delete_update">Delete</string>
      <string name="menu_copy_url">Copy URL</string>
-@@ -87,6 +88,7 @@
+@@ -96,6 +97,7 @@
      <string name="snack_download_failed">The download failed. Please check your internet connection and try again later.</string>
      <string name="snack_download_verification_failed">The update verification failed.</string>
      <string name="snack_download_verified">Download completed.</string>
diff --git a/Patches/LineageOS-19.1/android_packages_apps_Updater/0003-Server_Choices.patch b/Patches/LineageOS-19.1/android_packages_apps_Updater/0003-Server_Choices.patch
index 5fb30ffe..cdcac232 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_Updater/0003-Server_Choices.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_Updater/0003-Server_Choices.patch
@@ -81,10 +81,10 @@ index 287c221..777c8ef 100644
 +    </string-array>
  </resources>
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 916e1e6..73f3979 100644
+index 81070f8..fc690f6 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -70,6 +70,11 @@
+@@ -79,6 +79,11 @@
      <string name="menu_auto_updates_check_interval_weekly">Once a week</string>
      <string name="menu_auto_updates_check_interval_monthly">Once a month</string>
      <string name="menu_auto_updates_check_interval_never">Never</string>
@@ -164,7 +164,7 @@ index 37e81d8..d6f22d2 100644
      public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates";
      public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
 diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
-index 2b42726..7ba5f48 100644
+index 2b42726..1577b3d 100644
 --- a/src/org/lineageos/updater/misc/Utils.java
 +++ b/src/org/lineageos/updater/misc/Utils.java
 @@ -210,14 +210,33 @@ public class Utils {
diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index 8f80bcbc..2c6c51bd 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -136,7 +136,7 @@ done
 declare -a threeDotEighteen=("${threeDotTen[@]}" "android_kernel_samsung_universal8890.sh" "android_kernel_google_dragon.sh" "android_kernel_zte_msm8996.sh" "android_kernel_asus_msm8953.sh" "android_kernel_google_marlin.sh" "android_kernel_motorola_msm8996.sh" "android_kernel_oneplus_msm8996.sh");
 for script in "${threeDotEighteen[@]}"
 do
-	commentPatches $script "0008-Graphene-Kernel_Hardening-slub/4.4/0002.patch" "CVE-2018-16597/4.4" "CVE-2019-19319/4.4" "CVE-2020-0305/4.4" "CVE-2020-0429/4.4" "CVE-2020-8992/4.4" "CVE-2021-1048/4.4" "CVE-2021-3428/4.4" "CVE-2021-20265/4.4" "CVE-2021-47277" "CVE-2021-47320" "CVE-2022-1184/4.4/0014.patch" "CVE-2022-1184/4.9/0007.patch" "CVE-2022-40768/4.9/0007.patch" "CVE-2022-40768/4.4/0008.patch" "CVE-2022-47929/4.4" "CVE-2023-0458" "CVE-2024-26889";
+	commentPatches $script "0008-Graphene-Kernel_Hardening-slub/4.4/0002.patch" "CVE-2018-16597/4.4" "CVE-2019-19319/4.4" "CVE-2020-0305/4.4" "CVE-2020-0429/4.4" "CVE-2020-8992/4.4" "CVE-2021-1048/4.4" "CVE-2021-3428/4.4" "CVE-2021-20265/4.4" "CVE-2021-47277" "CVE-2021-47320" "CVE-2022-1184/4.4/0014.patch" "CVE-2022-1184/4.9/0007.patch" "CVE-2022-40768/4.9/0007.patch" "CVE-2022-40768/4.4/0008.patch" "CVE-2022-47929/4.4" "CVE-2023-0458" "CVE-2024-26889" "CVE-2024-35954/^6.9" "CVE-2021-47495/4.4";
 done
 
 #4.4
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
index 965c3044..90f5aa7a 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
@@ -771,7 +771,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47476/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47478/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47499/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47518/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47520/4.4/0004.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
index 7c2736b8..7670e297 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
@@ -730,7 +730,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47476/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47478/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47499/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47518/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47520/4.4/0004.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
index 1d8e8776..e3d3f5c5 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
@@ -714,7 +714,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47476/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47478/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47483/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47499/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47518/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47520/4.4/0004.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh
index 76375935..ff890ae7 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh
@@ -527,7 +527,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47476/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47478/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47483/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47499/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47518/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47520/4.4/0004.patch
@@ -751,7 +751,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35930/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35935/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35944/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35947/^6.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35982/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36919/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36941/^6.9/0001.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
index b579fc52..a115413e 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
@@ -545,7 +545,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47476/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47478/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47483/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47499/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47518/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47520/4.4/0004.patch
@@ -768,7 +768,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35930/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35935/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35944/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35947/^6.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35982/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36919/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36941/^6.9/0001.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
index b69e5b64..2829ad1e 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
@@ -530,7 +530,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47476/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47478/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47483/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47495/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47499/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47518/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47520/4.4/0004.patch
@@ -756,7 +756,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35930/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35935/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35944/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35947/^6.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35982/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36919/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36941/^6.9/0001.patch