From f9cee4664b838bae97e77426e84f8bc79b7f0119 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 22 Mar 2023 19:20:44 -0400
Subject: [PATCH] Churn

Signed-off-by: Tad <tad@spotco.us>
---
 .../0013-Network_Permission-1.patch                    |  2 +-
 .../0013-Sensors_Permission.patch                      |  2 +-
 .../0013-Special_Permissions.patch                     | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch b/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch
index 8557efd0..8585d3ba 100644
--- a/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch
+++ b/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch
@@ -22,7 +22,7 @@ index 0aafab66dabd..c66b55feff34 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 b0bf73293452..d3367ea8e26d 100644
+index e9267683ba19..10da8dff5d83 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -771,7 +771,7 @@ public class PermissionManagerService {
diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch b/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch
index a1b465d1..d7a9ce3d 100644
--- a/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch
+++ b/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch
@@ -81,7 +81,7 @@ index fd30d719b996..1a64ae235456 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 d3367ea8e26d..a36f31dd5af6 100644
+index 10da8dff5d83..89348bcf49c3 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -771,7 +771,7 @@ public class PermissionManagerService {
diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch b/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch
index 333fe0f9..c6dc88cf 100644
--- a/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch
+++ b/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch
@@ -25,7 +25,7 @@ index 25f70b23e68f..443d9a1a2f91 100644
                          != PERMISSION_OPERATION_FAILURE) {
                      writeRuntimePermissions = true;
 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 bdfe64c2c348..b0bf73293452 100644
+index b902001cd359..e9267683ba19 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -770,6 +770,10 @@ public class PermissionManagerService {
@@ -76,7 +76,7 @@ index bdfe64c2c348..b0bf73293452 100644
                                  // Propagate the permission flags.
                                  permissionsState.updatePermissionFlags(bp, userId, flags, flags);
                              }
-@@ -1461,7 +1475,7 @@ public class PermissionManagerService {
+@@ -1468,7 +1482,7 @@ public class PermissionManagerService {
                      && (grantedPermissions == null
                             || ArrayUtils.contains(grantedPermissions, permission))) {
                  final int flags = permissionsState.getPermissionFlags(permission, userId);
@@ -85,7 +85,7 @@ index bdfe64c2c348..b0bf73293452 100644
                      // Installer cannot change immutable permissions.
                      if ((flags & immutableFlags) == 0) {
                          grantRuntimePermission(permission, pkg.packageName, false, callingUid,
-@@ -1520,7 +1534,7 @@ public class PermissionManagerService {
+@@ -1527,7 +1541,7 @@ public class PermissionManagerService {
          // install permission's state is shared across all users.
          if (mSettings.mPermissionReviewRequired
                  && pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
@@ -94,7 +94,7 @@ index bdfe64c2c348..b0bf73293452 100644
              return;
          }
  
-@@ -1556,7 +1570,8 @@ public class PermissionManagerService {
+@@ -1563,7 +1577,8 @@ public class PermissionManagerService {
                      + permName + " for package " + packageName);
          }
  
@@ -104,7 +104,7 @@ index bdfe64c2c348..b0bf73293452 100644
              Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
              return;
          }
-@@ -1641,7 +1656,8 @@ public class PermissionManagerService {
+@@ -1648,7 +1663,8 @@ public class PermissionManagerService {
          // install permission's state is shared across all users.
          if (mSettings.mPermissionReviewRequired
                  && pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M