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 0fde75eb..fc9e9e44 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,7 +23,7 @@ index cb6ef5a8f1ae..4692ddb26491 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 8ef30f2d5be2..e46aa980468c 100644
+index 5f0beea38af5..ba5572eb4383 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -2592,7 +2592,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
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 35d58345..1caf591a 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,7 +99,7 @@ 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 e46aa980468c..2dc4f5b39253 100644
+index ba5572eb4383..f7a09f49aacb 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -2592,7 +2592,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
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 246e1bbd..55b5f2cc 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,7 +8,7 @@ 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 41b43e3c38bd..8ef30f2d5be2 100644
+index eeff027cb46c..5f0beea38af5 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 {
@@ -29,7 +29,7 @@ index 41b43e3c38bd..8ef30f2d5be2 100644
                                  uidState.updatePermissionFlags(permission,
                                          PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
                                                  | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT,
-@@ -2851,7 +2851,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2815,7 +2815,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
          //                continue;
          //            }
  
@@ -38,7 +38,7 @@ index 41b43e3c38bd..8ef30f2d5be2 100644
                          if (DEBUG_PERMISSIONS) {
                              Log.i(TAG, "Denying runtime-only permission " + bp.getName()
                                      + " for package " + friendlyName);
-@@ -2930,7 +2930,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2894,7 +2894,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                          boolean restrictionApplied = (origState.getPermissionFlags(
                                  bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
  
@@ -47,7 +47,7 @@ index 41b43e3c38bd..8ef30f2d5be2 100644
                              // If hard restricted we don't allow holding it
                              if (permissionPolicyInitialized && hardRestricted) {
                                  if (!restrictionExempt) {
-@@ -3015,7 +3015,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2978,7 +2978,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 04aa00a1..5677bcb8 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,7 +20,7 @@ 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 54a6c678e0da..41b43e3c38bd 100644
+index 2662f620cbd4..eeff027cb46c 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 {
@@ -74,7 +74,7 @@ index 54a6c678e0da..41b43e3c38bd 100644
      /**
       * Restore the permission state for a package.
       *
-@@ -2966,6 +2974,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -2929,6 +2937,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                                      }
                                  }
                              }
@@ -88,7 +88,7 @@ index 54a6c678e0da..41b43e3c38bd 100644
                          } else {
                              if (origPermState == null) {
                                  // New permission
-@@ -3803,7 +3818,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -3766,7 +3781,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_Settings/0004-Private_DNS.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch
index a8702784..7fa43243 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch
@@ -81,7 +81,7 @@ index 12e29e693b..b6745806b5 100644
                  android:id="@+id/private_dns_mode_opportunistic"
                  layout="@layout/preference_widget_dialog_radiobutton"/>
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index a5354ef8bc..b7c9a4b6b4 100644
+index 3ea294b8d5..15c0237c8a 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
 @@ -81,6 +81,21 @@
diff --git a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
index 69a5038a..b1110ef4 100644
--- a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
+++ b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
@@ -64,7 +64,7 @@ index 924cd3345..fa96b73c0 100644
      /**
       * Randomized MAC address to use with this particular network
 diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
-index 1c87eb2fa..9032bfb54 100644
+index b0212133a..5f40104ce 100644
 --- a/service/java/com/android/server/wifi/WifiConfigManager.java
 +++ b/service/java/com/android/server/wifi/WifiConfigManager.java
 @@ -431,6 +431,10 @@ public class WifiConfigManager {