Fixups + Churn

Signed-off-by: Tavi <[email protected]>

Author: SkewedZeppelin

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

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

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) {

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) {

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);

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 <[email protected]>
 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);
          }
 

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 <[email protected]>
 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);
          }
 

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 <[email protected]>
 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));
      }
 

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 <[email protected]>
 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,15 +57,15 @@ 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;
 +                            trimApprovedListsForInvalidServices(pkgName, UserHandle.getUserId(uid));
                          }
                      }
                  }
-@@ -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 {
          }
      }