From 65df2c1a534971e6ce71df7ca27ce31767f9c4de Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 12 Jun 2022 10:38:06 -0400
Subject: [PATCH] Churn

Signed-off-by: Tad <tad@spotco.us>
---
 .../android_frameworks_base/0014-Network_Permission-1.patch   | 4 ++--
 .../android_frameworks_base/0014-Network_Permission-2.patch   | 4 ++--
 .../android_frameworks_base/0014-Sensors_Permission.patch     | 4 ++--
 .../android_frameworks_base/0014-Special_Permissions.patch    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-1.patch b/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-1.patch
index 689f69fc..f957bfbb 100644
--- a/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-1.patch
+++ b/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-1.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] make INTERNET into a special runtime permission
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 7bcd7a048db4..571099f059c8 100644
+index 586d9a819d1e..85e86237adf6 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -1539,7 +1539,7 @@
+@@ -1540,7 +1540,7 @@
      <permission android:name="android.permission.INTERNET"
          android:description="@string/permdesc_createNetworkSockets"
          android:label="@string/permlab_createNetworkSockets"
diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-2.patch b/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-2.patch
index db199b93..cb524906 100644
--- a/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-2.patch
+++ b/Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-2.patch
@@ -22,10 +22,10 @@ index cd78602d9cd9..b99634c11742 100644
      field public static final String SENSORS = "android.permission-group.SENSORS";
      field public static final String SMS = "android.permission-group.SMS";
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 571099f059c8..b51e4f21454b 100644
+index 85e86237adf6..a951eb951613 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -1533,10 +1533,18 @@
+@@ -1534,10 +1534,18 @@
      <!-- ======================================= -->
      <eat-comment />
  
diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0014-Sensors_Permission.patch b/Patches/LineageOS-17.1/android_frameworks_base/0014-Sensors_Permission.patch
index 546e2b20..5c950375 100644
--- a/Patches/LineageOS-17.1/android_frameworks_base/0014-Sensors_Permission.patch
+++ b/Patches/LineageOS-17.1/android_frameworks_base/0014-Sensors_Permission.patch
@@ -47,10 +47,10 @@ index 861b0d922d32..e9a0696ebaff 100644
                      android.os.Build.VERSION_CODES.DONUT, 0),
              new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index b51e4f21454b..d5bc3cd38c07 100644
+index a951eb951613..9b0891d853de 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -1331,6 +1331,18 @@
+@@ -1332,6 +1332,18 @@
          android:description="@string/permdesc_useBiometric"
          android:protectionLevel="normal" />
  
diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0014-Special_Permissions.patch b/Patches/LineageOS-17.1/android_frameworks_base/0014-Special_Permissions.patch
index 39c439e6..1c344704 100644
--- a/Patches/LineageOS-17.1/android_frameworks_base/0014-Special_Permissions.patch
+++ b/Patches/LineageOS-17.1/android_frameworks_base/0014-Special_Permissions.patch
@@ -11,10 +11,10 @@ need to be granted by default for all apps to maintain compatibility.
  2 files changed, 20 insertions(+), 6 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index edaa60f4b09e..834a6b0d5260 100644
+index 443687a650c8..69bf7c5f38b5 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
-@@ -20162,7 +20162,8 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -20172,7 +20172,8 @@ public class PackageManagerService extends IPackageManager.Stub
              }
  
              // If this permission was granted by default, make sure it is.