Fixup + Churn

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

Author: SkewedZeppelin

Patches/LineageOS-14.1/android_frameworks_base/393646.patch

@@ -1,4 +1,4 @@
-From 2786005045df9d37fc4de14e5e4f60b9d5ec59b7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Dmitry Dementyev <[email protected]>
 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 126955add01a9..6ae79ec2e4aaa 100644
+index b28e532c01bb..77fd4a8d6054 100644
 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
 +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
-@@ -2971,6 +2971,11 @@ public void onResult(Bundle result) {
+@@ -3002,6 +3002,11 @@ public class AccountManagerService
 
              // Strip auth token from result.
              result.remove(AccountManager.KEY_AUTHTOKEN);
@@ -29,7 +29,7 @@ index 126955add01a9..6ae79ec2e4aaa 100644
 
              if (Log.isLoggable(TAG, Log.VERBOSE)) {
                  Log.v(TAG,
-@@ -4402,6 +4407,11 @@ public void onResult(Bundle result) {
+@@ -4493,6 +4498,11 @@ public class AccountManagerService
                      } else {
                          if (mStripAuthTokenFromResult) {
                              result.remove(AccountManager.KEY_AUTHTOKEN);

Patches/LineageOS-14.1/android_frameworks_base/393647.patch

@@ -1,8 +1,7 @@
-From 1595b95840ad55128edacd32996afb954480aefd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Wailes <[email protected]>
 Date: Thu, 18 Apr 2019 18:25:57 -0700
-Subject: [PATCH] [BACKPORT] Adds additional sanitization for Zygote command
- arguments.
+Subject: [PATCH] Adds additional sanitization for Zygote command arguments.
 
 Previously we were only insuring that the arguments provided to the
 Zygote didn't contain any newlines.  This adds additional checks for
@@ -19,7 +18,7 @@ Merged-In: I4055c50d52db0047c02c11096710fd07b429660c
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
-index e1b7fdad25e7d..1e084529de6e5 100644
+index e1b7fdad25e7..1e084529de6e 100644
 --- a/core/java/android/os/Process.java
 +++ b/core/java/android/os/Process.java
 @@ -16,6 +16,7 @@
@@ -30,7 +29,7 @@ index e1b7fdad25e7d..1e084529de6e5 100644
  import android.annotation.TestApi;
  import android.net.LocalSocket;
  import android.net.LocalSocketAddress;
-@@ -564,15 +565,19 @@ private static String getAbiList(BufferedWriter writer, DataInputStream inputStr
+@@ -564,15 +565,19 @@ public class Process {
       * @throws ZygoteStartFailedEx if process start failed for any reason
       */
      private static ProcessStartResult zygoteSendArgsAndGetResult(

Patches/LineageOS-14.1/android_frameworks_base/393648.patch

@@ -1,7 +1,7 @@
-From 556cc034e359fd1bb64a1b16ebe7a61f06810bcb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hans Boehm <[email protected]>
 Date: Tue, 2 Jan 2024 16:53:13 -0800
-Subject: [PATCH] [BACKPORT] Check hidden API exemptions
+Subject: [PATCH] Check hidden API exemptions
 
 Refuse to deal with newlines and null characters in
 HiddenApiSettings.update(). Also disallow nulls in process start
@@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
  1 file changed, 2 insertions(+)
 
 diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
-index 1e084529de6e5..de8287baa828b 100644
+index 1e084529de6e..de8287baa828 100644
 --- a/core/java/android/os/Process.java
 +++ b/core/java/android/os/Process.java
-@@ -578,6 +578,8 @@ private static ProcessStartResult zygoteSendArgsAndGetResult(
+@@ -578,6 +578,8 @@ public class Process {
                      throw new ZygoteStartFailedEx("Embedded newlines not allowed");
                  } else if (args.get(i).indexOf('\r') >= 0) {
                      throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");

Patches/LineageOS-14.1/android_frameworks_base/393649.patch

@@ -1,8 +1,8 @@
-From 53abf79f26084d26d2887d716137fa9cd4eeefc9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ameer Armaly <[email protected]>
 Date: Fri, 8 Mar 2024 19:41:06 +0000
-Subject: [PATCH] [RESTRICT AUTOMERGE] AccessibilityManagerService: remove
- uninstalled services from enabled list after service update.
+Subject: [PATCH] AccessibilityManagerService: remove uninstalled services from
+ enabled list after service update.
 
 Bug: 326485767
 Test: atest AccessibilityEndToEndTest#testUpdateServiceWithoutIntent_disablesService
@@ -16,10 +16,10 @@ Change-Id: I898044b388399bded66acb22dba55c5df26ccc9f
  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 34ccb7b82c87c..38cf47a5d87b9 100644
+index cae1adcafc23..b030dd4f6ead 100644
 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
 +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
-@@ -1294,10 +1294,13 @@ private void updateServicesLocked(UserState userState) {
+@@ -1302,10 +1302,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
          boolean isUnlockingOrUnlocked = mContext.getSystemService(UserManager.class)
                  .isUserUnlockingOrUnlocked(userState.mUserId);
 
@@ -33,7 +33,7 @@ index 34ccb7b82c87c..38cf47a5d87b9 100644
 
              Service service = componentNameToServiceMap.get(componentName);
 
-@@ -1325,6 +1328,25 @@ private void updateServicesLocked(UserState userState) {
+@@ -1333,6 +1336,25 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
              }
          }
 

Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch

@@ -9,10 +9,10 @@ Ported from 12: b294a2ce1d0d185dbc438ac3c06c90386d5f5949
  1 file changed, 30 insertions(+), 9 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-index 8dadd3190ac3..b1de8d8a5830 100644
+index 96c34db79898..9fd704ac7d44 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-@@ -1409,7 +1409,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -1410,7 +1410,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
              // 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.
@@ -22,7 +22,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                  return;
              }
 
-@@ -1452,7 +1453,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -1453,7 +1454,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
                              + " for package " + packageName);
                  }
 
@@ -32,7 +32,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                      Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
                      return;
                  }
-@@ -1598,7 +1600,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -1599,7 +1601,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
              // 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.
@@ -42,7 +42,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                  return;
              }
 
-@@ -1785,7 +1788,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -1786,7 +1789,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
              // 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);
@@ -52,7 +52,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                      ? FLAG_PERMISSION_REVIEW_REQUIRED | FLAG_PERMISSION_REVOKED_COMPAT
                      : 0;
 
-@@ -1805,7 +1809,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -1806,7 +1810,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
 
              // If this permission was granted by default or role, make sure it is.
              if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0
@@ -62,7 +62,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                  // PermissionPolicyService will handle the app op for runtime permissions later.
                  grantRuntimePermissionInternal(packageName, permName, false,
                          Process.SYSTEM_UID, userId, delayingPermCallback);
-@@ -2518,6 +2523,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2519,6 +2524,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
          }
      }
 
@@ -73,7 +73,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
      /**
       * Restore the permission state for a package.
       *
-@@ -2642,6 +2651,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2643,6 +2652,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
          synchronized (mLock) {
              for (final int userId : userIds) {
                  final UserPermissionState userState = mState.getOrCreateUserState(userId);
@@ -82,7 +82,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                  final UidPermissionState uidState = userState.getOrCreateUidState(ps.getAppId());
 
                  if (uidState.isMissing()) {
-@@ -2658,7 +2669,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2659,7 +2670,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
                                          FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT,
                                          FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT);
                              }
@@ -91,7 +91,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                                  uidState.updatePermissionFlags(permission,
                                          PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
                                                  | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT,
-@@ -2854,7 +2865,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2855,7 +2866,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
                          boolean restrictionApplied = (origState.getPermissionFlags(
                                  bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
 
@@ -100,7 +100,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                              // If hard restricted we don't allow holding it
                              if (permissionPolicyInitialized && hardRestricted) {
                                  if (!restrictionExempt) {
-@@ -2907,6 +2918,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2908,6 +2919,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
                                      }
                                  }
                              }
@@ -117,7 +117,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                          } else {
                              if (origPermState == null) {
                                  // New permission
-@@ -2941,7 +2962,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2942,7 +2963,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
                                  if (restrictionApplied) {
                                      flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION;
                                      // Dropping restriction on a legacy app implies a review
@@ -126,7 +126,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
                                          flags |= FLAG_PERMISSION_REVIEW_REQUIRED;
                                      }
                                      wasChanged = true;
-@@ -3658,7 +3679,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -3659,7 +3680,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
              if (shouldGrantPermission) {
                  final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission,
                          myUid, userId);

Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch

@@ -9,10 +9,10 @@ Subject: [PATCH] srt permissions: don't auto-grant denied ones when
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-index 29658387fed4..5d2bb41c4b4d 100644
+index f4064d1ab984..556443b40c3d 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-@@ -1810,7 +1810,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -1811,7 +1811,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
              // If this permission was granted by default or role, make sure it is.
              if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0
                      || (oldFlags & FLAG_PERMISSION_GRANTED_BY_ROLE) != 0

Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch

@@ -67,10 +67,10 @@ index 2091c0502b6f..4c45fdc4de44 100644
      <string name="capability_title_canRetrieveWindowContent">Retrieve window content</string>
      <!-- Description for the capability of an accessibility service to retrieve window content. -->
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-index b1de8d8a5830..6ea489ce05b6 100644
+index 9fd704ac7d44..fde265d12bf9 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-@@ -2524,7 +2524,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2525,7 +2525,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
      }
 
      public static boolean isSpecialRuntimePermission(final String permission) {

Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch

@@ -86,10 +86,10 @@ index 4c45fdc4de44..e0ca922bf686 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/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-index 6ea489ce05b6..29658387fed4 100644
+index fde265d12bf9..f4064d1ab984 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-@@ -2524,7 +2524,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2525,7 +2525,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
      }
 
      public static boolean isSpecialRuntimePermission(final String permission) {

Patches/LineageOS-20.0/android_frameworks_base/0039-package_hooks.patch

@@ -159,7 +159,7 @@ index a9b624653b92..9cac3e75a698 100644
                              ATTR_ENABLED_CALLER);
                      final String harmfulAppWarning =
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
-index 5d2bb41c4b4d..fae8dc90371a 100644
+index 556443b40c3d..ac5aadd45467 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
 @@ -127,6 +127,7 @@ import com.android.server.LocalServices;
@@ -170,7 +170,7 @@ index 5d2bb41c4b4d..fae8dc90371a 100644
  import com.android.server.pm.ApexManager;
  import com.android.server.pm.KnownPackages;
  import com.android.server.pm.UserManagerInternal;
-@@ -1363,6 +1364,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -1364,6 +1365,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
              isRolePermission = permission.isRole();
              isSoftRestrictedPermission = permission.isSoftRestricted();
          }
@@ -184,7 +184,7 @@ index 5d2bb41c4b4d..fae8dc90371a 100644
          final boolean mayGrantRolePermission = isRolePermission
                  && mayManageRolePermission(callingUid);
          final boolean mayGrantSoftRestrictedPermission = isSoftRestrictedPermission
-@@ -2982,6 +2990,11 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+@@ -2983,6 +2991,11 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
                          Slog.wtf(LOG_TAG, "Unknown permission protection " + bp.getProtection()
                                  + " for permission " + bp.getName());
                      }

Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch

@@ -376,18 +376,18 @@ index 774d1be..8a01e3d 100644
          android:id="@+id/preferences_auto_delete_updates"
          android:layout_width="match_parent"
 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
-index 8c64dca..6b78e39 100644
+index 0303481..46bb291 100644
 --- a/app/src/main/res/values/strings.xml
 +++ b/app/src/main/res/values/strings.xml
-@@ -59,6 +59,7 @@
+@@ -68,6 +68,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>
 +    <string name="menu_onion_routing">Perform requests over Tor</string>
      <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>
-@@ -76,6 +77,7 @@
+@@ -85,6 +86,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>