Refresh most branch specific patches

Fixed up:
LineageOS-16.0/android_packages_apps_Backgrounds/308977.patch
LineageOS-16.0/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch
LineageOS-17.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch
LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch

Must review again:
LineageOS-14.1/android_packages_apps_PackageInstaller/64d8b44.patch

Signed-off-by: Tad <tad@spotco.us>

Patches/LineageOS-14.1/android_bootable_recovery/0001-Squash_Menus.patch

@@ -1,4 +1,4 @@
-From 7664f3dd48cd8a0af6b3dd88169699f5a0465189 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Sat, 20 Jan 2018 07:34:05 -0500
 Subject: [PATCH] Squash menus
@@ -9,7 +9,7 @@ Change-Id: I683fd133498fc3317796a037567cdab46350431c
  1 file changed, 11 insertions(+), 41 deletions(-)
 
 diff --git a/device.cpp b/device.cpp
-index aed7211..a962c72 100644
+index aed7211d..a962c728 100644
 --- a/device.cpp
 +++ b/device.cpp
 @@ -38,32 +38,14 @@ struct menu_entry {
@@ -91,5 +91,5 @@ index aed7211..a962c72 100644
      MAIN_MENU_NAMES,
      MAIN_MENU_ENTRIES
 -- 
-2.16.0
+2.31.1
 

Patches/LineageOS-14.1/android_build/0001-OTA_Keys.patch

@@ -1,4 +1,4 @@
-From 7982c8a06516e8b1d113953a3f3cf2e32a3a7ba5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 5 Apr 2021 23:11:12 -0400
 Subject: [PATCH] Allow setting OTA public keys from environment variable
@@ -10,7 +10,7 @@ Change-Id: Iaa8890283c30441bf8543a8ca1cd9296e9453d91
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/core/Makefile b/core/Makefile
-index 3fb424733..67e0170e6 100644
+index 3fb424733d..67e0170e67 100644
 --- a/core/Makefile
 +++ b/core/Makefile
 @@ -1033,9 +1033,8 @@ endif
@@ -26,7 +26,7 @@ index 3fb424733..67e0170e6 100644
  
  # Generate a file containing the keys that will be read by the
 diff --git a/core/product_config.mk b/core/product_config.mk
-index 7b440b1ef..f26ebb6d5 100644
+index 7b440b1eff..f26ebb6d55 100644
 --- a/core/product_config.mk
 +++ b/core/product_config.mk
 @@ -422,6 +422,11 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \
@@ -42,5 +42,5 @@ index 7b440b1ef..f26ebb6d5 100644
      $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))
  PRODUCT_DEX_PREOPT_BOOT_FLAGS := \
 -- 
-2.30.2
+2.31.1
 

Patches/LineageOS-14.1/android_device_asus_grouper/0001-Update_Blobs.patch

@@ -1,4 +1,4 @@
-From be52768051dd1978bb6a4b9bd46aff4eb09c0412 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Harry Youd <harry@harryyoud.co.uk>
 Date: Mon, 26 Mar 2018 15:52:22 +0200
 Subject: [PATCH] grouper: Initial 14.1 blob list
@@ -6,9 +6,9 @@ Subject: [PATCH] grouper: Initial 14.1 blob list
 Change-Id: I1e9a7e2a998810778426ab522995af2f90529b44
 ---
  device-common.mk              |  6 +--
- extract-files.sh              | 63 ++++++++++++++++++++++++++++++
+ extract-files.sh              | 63 +++++++++++++++++++++++++
- lineage-proprietary-files.txt | 89 +++++++++++++++++++++++++++++++++++++++++++
+ lineage-proprietary-files.txt | 89 +++++++++++++++++++++++++++++++++++
- setup-makefiles.sh            | 48 +++++++++++++++++++++++
+ setup-makefiles.sh            | 48 +++++++++++++++++++
  4 files changed, 201 insertions(+), 5 deletions(-)
  create mode 100755 extract-files.sh
  create mode 100644 lineage-proprietary-files.txt
@@ -246,3 +246,6 @@ index 0000000..7c82753
 +
 +# Finish
 +write_footers
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_device_asus_grouper/0002-Perf_Tweaks.patch

@@ -1,15 +1,15 @@
-From 74a903c4ee34bb0ab058a749789805f765479a1e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 11 Jul 2018 13:54:10 -0400
 Subject: [PATCH] Performance tweaks from @AndDiSa
 
 Change-Id: I87e7b700b3caf713e98bcfdc74613da23139db70
 ---
- BoardConfigCommon.mk                          |  3 ++
+ BoardConfigCommon.mk                          |  3 +++
- device.mk                                     |  3 +-
+ device.mk                                     |  3 ++-
  .../base/core/res/res/values/config.xml       |  7 +++++
- system.prop                                   | 29 +++++++++++++++++--
+ system.prop                                   | 27 ++++++++++++++++---
- 4 files changed, 38 insertions(+), 4 deletions(-)
+ 4 files changed, 36 insertions(+), 4 deletions(-)
 
 diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
 index f402c86..c84be43 100644
@@ -26,6 +26,7 @@ index f402c86..c84be43 100644
  
  # Filesystem
 diff --git a/device.mk b/device.mk
+index 33c1fc9..8d8c65a 100644
 --- a/device.mk
 +++ b/device.mk
 @@ -24,7 +24,8 @@ PRODUCT_COPY_FILES += \
@@ -39,6 +40,7 @@ diff --git a/device.mk b/device.mk
  DEVICE_PACKAGE_OVERLAYS += \
      device/asus/grouper/overlay
 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
+index d28e4fb..c9ec73a 100644
 --- a/overlay/frameworks/base/core/res/res/values/config.xml
 +++ b/overlay/frameworks/base/core/res/res/values/config.xml
 @@ -219,4 +219,11 @@
@@ -54,6 +56,7 @@ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/fr
 +
  </resources>
 diff --git a/system.prop b/system.prop
+index b1d9807..1b1daa5 100644
 --- a/system.prop
 +++ b/system.prop
 @@ -12,6 +12,27 @@ ro.sf.lcd_density=213
@@ -88,5 +91,5 @@ diff --git a/system.prop b/system.prop
 +ro.sys.fw.use_trim_settings=true
 +dalvik.vm.madvise-random=true
 -- 
-2.18.0
+2.31.1
 

Patches/LineageOS-14.1/android_device_qcom_sepolicy/0001-Camera_Fix.patch

@@ -1,4 +1,4 @@
-From 90b0885a265a65230691d9ee8544ae2b817fd2d3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 15 Mar 2017 12:51:35 -0400
 Subject: [PATCH] TEMPORARY fix camera not working on user builds
@@ -9,7 +9,7 @@ Change-Id: I7590d396599fdbccba884391b333e309dbea4bb5
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/common/mediaserver.te b/common/mediaserver.te
-index 4c6c024..b0a6801 100644
+index caf7f646..df78c916 100644
 --- a/common/mediaserver.te
 +++ b/common/mediaserver.te
 @@ -13,12 +13,10 @@ binder_call(mediaserver, rild)
@@ -30,5 +30,5 @@ index 4c6c024..b0a6801 100644
  r_dir_file(mediaserver, sysfs_esoc)
  allow mediaserver system_app_data_file:file rw_file_perms;
 -- 
-2.9.3
+2.31.1
 

Patches/LineageOS-14.1/android_device_qcom_sepolicy/248649.patch

@@ -1,4 +1,4 @@
-From 334f543513c0cd2dbbf4b6450fb50d9f9a523385 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: syphyr <syphyr@gmail.com>
 Date: Mon, 20 May 2019 00:04:28 +0200
 Subject: [PATCH] sepolicy: msm_irqbalance: Allow read for stats and interrupts
@@ -23,3 +23,6 @@ index d4c3e57d..f9dd9004 100644
 +allow msm_irqbalanced { proc_stat proc_interrupts }:file r_file_perms;
  allow msm_irqbalanced self:capability { setuid setgid dac_override };
  r_dir_file(msm_irqbalanced, sysfs_rqstats);
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_device_samsung_tuna/0001-fix_denial.patch

@@ -1,4 +1,4 @@
-From 3030156fc1e0e69e5fad36fb374a8eb19fed8875 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: nailyk-fr <nailyk_git@nailyk.fr>
 Date: Sat, 12 Aug 2017 18:46:10 +0200
 Subject: [PATCH] tuna: twrp: Add necessary policy for twrp decrypt
@@ -9,7 +9,7 @@ Change-Id: I7fab77518718961ca55f29c5263a43e69efc73ca
  1 file changed, 21 insertions(+)
 
 diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
-index dca66805..0d30c0d7 100644
+index dca6680..0d30c0d 100644
 --- a/sepolicy/recovery.te
 +++ b/sepolicy/recovery.te
 @@ -40,3 +40,24 @@ allow recovery { efs_file radio_efs_file bluetooth_efs_file }:file { getattr ope
@@ -37,3 +37,6 @@ index dca66805..0d30c0d7 100644
 +allow init tee_file:dir rw_dir_perms;
 +allow init tee_file:file create_file_perms;
 +allow init labeledfs:filesystem associate;
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_device_samsung_tuna/0002-fix_denial.patch

@@ -1,4 +1,4 @@
-From b9219da6cc3efc4cce9ef39a2d570990fd68cf11 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: nailyk-fr <nailyk_git@nailyk.fr>
 Date: Sun, 13 Aug 2017 20:31:53 +0200
 Subject: [PATCH] Tuna: Sepolicy: Add tee-fs permissions
@@ -22,7 +22,7 @@ Change-Id: I559f15713c7893b97c7e33f421ff19d606814fb1
  1 file changed, 3 insertions(+)
 
 diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
-index 0d30c0d7..f1047b45 100644
+index 0d30c0d..f1047b4 100644
 --- a/sepolicy/recovery.te
 +++ b/sepolicy/recovery.te
 @@ -43,6 +43,9 @@ allow recovery powerctl_prop:property_service set;
@@ -35,3 +35,6 @@ index 0d30c0d7..f1047b45 100644
  #============= healthd ==============
  allow healthd device:dir write;
  
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_device_samsung_tuna/0003-fix_denial.patch

@@ -1,4 +1,4 @@
-From 03320366719016a58225cf2dcf428d9ff04f9039 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: nailyk-fr <nailyk_git@nailyk.fr>
 Date: Sun, 13 Aug 2017 20:51:06 +0200
 Subject: [PATCH] Tuna: Sepolicy: Label metadata partition
@@ -22,10 +22,10 @@ Change-Id: I577794a7298fcd105392699466661a7bd85a6218
  2 files changed, 3 insertions(+)
 
 diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
-index 1225c878..efd06764 100644
+index 30159d4..42a58d1 100644
 --- a/sepolicy/file_contexts
 +++ b/sepolicy/file_contexts
-@@ -46,11 +46,13 @@
+@@ -49,11 +49,13 @@
  # Block devices
  /dev/block/mmcblk0					u:object_r:root_block_device:s0
  /dev/block/mmcblk0p9					u:object_r:radio_device:s0
@@ -40,7 +40,7 @@ index 1225c878..efd06764 100644
  /dev/block/platform/omap/omap_hsmmc.0/by-name/radio	u:object_r:radio_device:s0
  /dev/block/platform/omap/omap_hsmmc.0/by-name/dgs	u:object_r:tee_block_device:s0
 diff --git a/sepolicy/vold.te b/sepolicy/vold.te
-index 9ba84692..313104b5 100644
+index 9ba8469..313104b 100644
 --- a/sepolicy/vold.te
 +++ b/sepolicy/vold.te
 @@ -1,5 +1,6 @@
@@ -50,3 +50,6 @@ index 9ba84692..313104b5 100644
  
  # For 'aes-*' module requests.
  allow vold kernel:system module_request;
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_device_samsung_tuna/0004-fix_denial.patch

@@ -1,4 +1,4 @@
-From b50670cc845167011e16af63fcda74887f03c8ba Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: nailyk-fr <nailyk_git@nailyk.fr>
 Date: Sun, 13 Aug 2017 20:54:18 +0200
 Subject: [PATCH] Tuna: Sepolicy: Solve mediacodec denial
@@ -16,9 +16,12 @@ Change-Id: Ibd6674b3bbf245605b79c6d97ff6ed0d31715870
 
 diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te
 new file mode 100644
-index 00000000..711a2047
+index 0000000..711a204
 --- /dev/null
 +++ b/sepolicy/mediacodec.te
 @@ -0,0 +1,2 @@
 +#============= mediacodec ==============
 +allow mediacodec rpmsg_device:chr_file { read write open ioctl };
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_device_samsung_tuna/0005-fix_denial.patch

@@ -1,4 +1,4 @@
-From c11a7f1d4f05a13cacb8c6ebbaeee0400b6654e6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 13 Feb 2019 21:14:04 -0500
 Subject: [PATCH] audit2allow sepolicies
@@ -80,5 +80,5 @@ index e59d7c6..d78ffbb 100644
 +
 +allow system_server wifi_log_prop:property_service set;
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-14.1/android_external_sqlite/0001-Secure_Delete.patch

@@ -1,4 +1,4 @@
-From d06526ec844bf89e77c518dbcd0deb331babf8dd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sun, 18 Dec 2016 09:30:44 -0500
 Subject: [PATCH] Enable secure_delete by default
@@ -9,10 +9,10 @@ Change-Id: Ic2604b78f57998c001df9737ab0fdec2298122c4
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dist/Android.mk b/dist/Android.mk
-index bf277d2..8113e32 100644
+index d7bba41..e886945 100644
 --- a/dist/Android.mk
 +++ b/dist/Android.mk
-@@ -27,7 +27,8 @@ minimal_sqlite_flags := \
+@@ -28,7 +28,8 @@ minimal_sqlite_flags := \
  	-DSQLITE_OMIT_BUILTIN_TEST \
  	-DSQLITE_OMIT_COMPILEOPTION_DIAGS \
  	-DSQLITE_OMIT_LOAD_EXTENSION \
@@ -23,5 +23,5 @@ index bf277d2..8113e32 100644
  device_sqlite_flags := $(minimal_sqlite_flags) \
      -DSQLITE_ENABLE_ICU \
 -- 
-2.9.3
+2.31.1
 

Patches/LineageOS-14.1/android_frameworks_av/212799.patch

@@ -1,7 +1,7 @@
-From 351c3c0113c10ee221a98c07e4f3f6f5ebcc83d5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Robert Shih <robertshih@google.com>
 Date: Mon, 24 Oct 2016 11:38:31 -0700
-Subject: [PATCH] [BACKPORT] FLACExtractor: copy protect mWriteBuffer
+Subject: [PATCH] FLACExtractor: copy protect mWriteBuffer
 
 Bug: 30895578
 AOSP-Change-Id: I4cba36bbe3502678210e5925181683df9726b431
@@ -28,7 +28,7 @@ index 4dfd86a0b3..82a962bc73 100644
      FLACParser(
          const sp<DataSource> &dataSource,
          // If metadata pointers aren't provided, we don't fill them
-@@ -145,7 +149,7 @@ friend class FLACSource;
+@@ -145,7 +149,7 @@ private:
      bool mWriteRequested;
      bool mWriteCompleted;
      FLAC__FrameHeader mWriteHeader;
@@ -57,3 +57,6 @@ index 4dfd86a0b3..82a962bc73 100644
              ALOGE("unsupported channel count %u", getChannels());
              return NO_INIT;
          }
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_frameworks_base/0001-Reduced_Resolution.patch

@@ -1,18 +1,18 @@
-From 78c9088dabac1c042567faa3196dfd21fae900ef Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Sat, 21 Oct 2017 11:53:09 -0400
 Subject: [PATCH] Reduced Resolution Feature 2/2
 
 Change-Id: If92489ee9dc119acdeeb8f05f0d70970eef55817
 ---
- core/java/android/os/IPowerManager.aidl            |  3 +
+ core/java/android/os/IPowerManager.aidl       |  3 +
- core/java/android/os/PowerManager.java             | 32 ++++++++
+ core/java/android/os/PowerManager.java        | 32 +++++++
- core/java/android/os/PowerManagerInternal.java     |  2 +
+ .../java/android/os/PowerManagerInternal.java |  2 +
- .../android/server/power/PowerManagerService.java  | 85 ++++++++++++++++++++++
+ .../server/power/PowerManagerService.java     | 85 +++++++++++++++++++
  4 files changed, 122 insertions(+)
 
 diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl
-index 26eb7f169a0..d6051d0db74 100644
+index 26eb7f169a0b..d6051d0db74f 100644
 --- a/core/java/android/os/IPowerManager.aidl
 +++ b/core/java/android/os/IPowerManager.aidl
 @@ -75,4 +75,7 @@ interface IPowerManager
@@ -24,7 +24,7 @@ index 26eb7f169a0..d6051d0db74 100644
 +    boolean setReducedResolution(boolean mode);
  }
 diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
-index 5c8effec0ed..8c1d2fdf65b 100644
+index 3e6e6f5c60c7..f9ec29071ff6 100644
 --- a/core/java/android/os/PowerManager.java
 +++ b/core/java/android/os/PowerManager.java
 @@ -988,6 +988,38 @@ public final class PowerManager {
@@ -67,7 +67,7 @@ index 5c8effec0ed..8c1d2fdf65b 100644
       * Returns true if the device is currently in idle mode.  This happens when a device
       * has been sitting unused and unmoving for a sufficiently long period of time, so that
 diff --git a/core/java/android/os/PowerManagerInternal.java b/core/java/android/os/PowerManagerInternal.java
-index bbafb5662cd..e0c71a044a5 100644
+index bbafb5662cd6..e0c71a044a53 100644
 --- a/core/java/android/os/PowerManagerInternal.java
 +++ b/core/java/android/os/PowerManagerInternal.java
 @@ -173,6 +173,8 @@ public abstract class PowerManagerInternal {
@@ -80,7 +80,7 @@ index bbafb5662cd..e0c71a044a5 100644
  
      public abstract int getFeature(int featureId);
 diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
-index 55d0809ee4e..33cb0a93bb7 100644
+index 55d0809ee4e5..33cb0a93bb71 100644
 --- a/services/core/java/com/android/server/power/PowerManagerService.java
 +++ b/services/core/java/com/android/server/power/PowerManagerService.java
 @@ -29,6 +29,7 @@ import android.content.IntentFilter;
@@ -218,5 +218,5 @@ index 55d0809ee4e..33cb0a93bb7 100644
          public int getFeature(int featureId) {
              return nativeGetFeature(featureId);
 -- 
-2.14.2
+2.31.1
 

Patches/LineageOS-14.1/android_frameworks_base/0008-Disable_Analytics.patch

@@ -1,4 +1,4 @@
-From 5b59a2cf8028488847a5cd6ac7d4a14414972438 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 21 May 2018 04:23:40 -0400
 Subject: [PATCH] Disable/reduce functionality of various ad/analytics
@@ -6,14 +6,14 @@ Subject: [PATCH] Disable/reduce functionality of various ad/analytics
 
 Change-Id: I84303ee26d0232e471f44ae6eff6e41a2210e42e
 ---
- core/java/android/content/pm/PackageParser.java | 12 ++++++++++++
+ core/java/android/content/pm/PackageParser.java | 14 ++++++++++++++
- 1 file changed, 12 insertions(+)
+ 1 file changed, 14 insertions(+)
 
 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index 8c66fb227cf..31368bf74b1 100644
+index f2e3333b67da..f8bfc011e670 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
-@@ -5524,6 +5524,20 @@ public class PackageParser {
+@@ -4465,6 +4465,20 @@ public class PackageParser {
  
          if (data == null) {
              data = new Bundle();
@@ -35,5 +35,5 @@ index 8c66fb227cf..31368bf74b1 100644
  
          String name = sa.getNonConfigurationString(
 -- 
-2.17.0
+2.31.1
 

Patches/LineageOS-14.1/android_frameworks_base/0009-Sensors-P1.patch

@@ -1,7 +1,7 @@
-From 5ccfecfc925ec64d2f49c634701b1f9c1804dbcb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe <mse1969@posteo.de>
 Date: Mon, 26 Feb 2018 17:53:23 +0100
-Subject: [PATCH 1/3] - AppOps/PrivacyGuard: New Sensor checks [base]
+Subject: [PATCH] - AppOps/PrivacyGuard: New Sensor checks [base]
 
 Add two AppOps for sensor access:
 - OP_MOTION_SENSORS (default: allow, strict)

Patches/LineageOS-14.1/android_frameworks_base/0009-Sensors-P2.patch

@@ -1,7 +1,7 @@
-From 7fcc6be5ca1672ca0b48fa6d55224b34d0d0ebea Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe <mse1969@posteo.de>
 Date: Wed, 25 Apr 2018 23:07:47 +0200
-Subject: [PATCH 2/3] AppOpsService: Default mode 'allowed' for systemUID and
+Subject: [PATCH] AppOpsService: Default mode 'allowed' for systemUID and
  platform signed
 
 To avoid severe issues when setting selected Ops to 'ASK', the default

Patches/LineageOS-14.1/android_frameworks_base/0009-Sensors-P3.patch

@@ -1,7 +1,7 @@
-From 302c2986458e43cb666aa502e7767be389b2682f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe <mse1969@posteo.de>
 Date: Wed, 25 Apr 2018 23:12:20 +0200
-Subject: [PATCH 3/3] AppOps: Default MODE_ASK for OP_MOTION_SENSORS
+Subject: [PATCH] AppOps: Default MODE_ASK for OP_MOTION_SENSORS
 
 Change-Id: I4e8380c21b5c8a9e90c99d52e35d825ef0db6d98
 ---

Patches/LineageOS-14.1/android_frameworks_base/248599.patch

@@ -1,4 +1,4 @@
-From d5e4955bce55bf742f888859bb8b3b217de5dd7f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Christopher Tate <ctate@google.com>
 Date: Wed, 26 Oct 2016 18:06:42 -0700
 Subject: [PATCH] Make SET_TIME_ZONE permission match SET_TIME
@@ -32,3 +32,6 @@ index 0f224dae3337..f6026a82ad72 100644
  
      <!-- ==================================================== -->
      <!-- Permissions related to changing status bar   -->
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_frameworks_native/0001-Sensors.patch

@@ -1,7 +1,7 @@
-From def2d20e4361c1bd048353d91fe2fd6e38ff6a04 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe <mse1969@posteo.de>
 Date: Mon, 26 Feb 2018 17:58:17 +0100
-Subject: [PATCH] [PATCH 2/3] - AppOps/PrivacyGuard: New Sensor checks [native]
+Subject: [PATCH] - AppOps/PrivacyGuard: New Sensor checks [native]
 
 Add two AppOps for sensor access:
 - OP_MOTION_SENSORS (default: allow, strict)
@@ -22,7 +22,7 @@ diff --git a/include/binder/AppOpsManager.h b/include/binder/AppOpsManager.h
 index e2a6e702f4..62daa8f066 100644
 --- a/include/binder/AppOpsManager.h
 +++ b/include/binder/AppOpsManager.h
-@@ -104,7 +104,9 @@ class AppOpsManager
+@@ -104,7 +104,9 @@ public:
          OP_BOOT_COMPLETED = 66,
          OP_NFC_CHANGE = 67,
          OP_DATA_CONNECT_CHANGE = 68,
@@ -34,7 +34,7 @@ index e2a6e702f4..62daa8f066 100644
  
      AppOpsManager();
 diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
-index 4697d2f34b..575d6ca250 100644
+index 8edacc0c6d..c02939a7d8 100644
 --- a/libs/gui/Sensor.cpp
 +++ b/libs/gui/Sensor.cpp
 @@ -58,6 +58,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi
@@ -137,3 +137,6 @@ index d8e08775a4..fe47eb37e1 100644
      return true;
  }
  
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_qcom_display/227623.patch

@@ -1,4 +1,4 @@
-From 884ada777494cfb80ec77739703d6eef66c40d1e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Courtney Goeltzenleuchter <courtneygo@google.com>
 Date: Thu, 24 May 2018 08:23:55 -0600
 Subject: [PATCH] Fix Buffer Overflow in Vendor Service display.qservice
@@ -26,3 +26,6 @@ index d3c13eee9..90aa4f219 100644
    if (display >= HWC_NUM_DISPLAY_TYPES) {
      return -EINVAL;
    }
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_qcom_display/227624.patch

@@ -1,4 +1,4 @@
-From 6cabf9c6ba281ab44a6b94f0b5f8c3c2026416f9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Courtney Goeltzenleuchter <courtneygo@google.com>
 Date: Thu, 24 May 2018 08:23:55 -0600
 Subject: [PATCH] Fix Buffer Overflow in Vendor Service display.qservice
@@ -27,3 +27,6 @@ index 5f825c19b..e4b687d6b 100644
    auto err = CallDisplayFunction(device, display, &HWCDisplay::SetColorMode, mode);
    if (err != HWC2_ERROR_NONE)
      return -EINVAL;
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_qcom_display/229952.patch

@@ -1,4 +1,4 @@
-From 0d2fd535bedf567d8ec9adee5e5e5645164558f4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Courtney Goeltzenleuchter <courtneygo@google.com>
 Date: Thu, 24 May 2018 08:23:55 -0600
 Subject: [PATCH] Fix Buffer Overflow in Vendor Service display.qservice
@@ -44,3 +44,6 @@ index 96111d9f3..01c6d367b 100644
    auto err = CallDisplayFunction(device, display, &HWCDisplay::SetColorMode, mode);
    if (err != HWC2_ERROR_NONE)
      return -EINVAL;
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_qcom_gps/0001-rollover.patch

@@ -1,4 +1,4 @@
-From 895557ea85e34d3f969955f234186c5a0afab0a9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: jlask <jason972000@gmail.com>
 Date: Tue, 19 May 2020 10:04:37 -0500
 Subject: [PATCH] gps: Correct week rollover timestamps
@@ -85,5 +85,5 @@ index 6969fe5..9367012 100644
      TO_ALL_LOCADAPTERS(
          mLocAdapters[i]->reportPosition(location,
 -- 
-2.26.2
+2.31.1
 

Patches/LineageOS-14.1/android_hardware_qcom_media/227620.patch

@@ -1,4 +1,4 @@
-From ad22eabfe9abb5196bbf0136371e849a46142bc0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Santhosh Behara <santhoshbehara@codeaurora.org>
 Date: Tue, 15 May 2018 06:09:50 -0700
 Subject: [PATCH] mm-video-v4l2: Protect buffer access and increase input
@@ -184,3 +184,6 @@ index ccfb8c2d2..b887b72bd 100644
                          memcpy ( omxhdr->pBuffer, (void *)
                                  ((unsigned long)vdec_msg->msgdata.output_frame.bufferaddr +
                                   (unsigned long)vdec_msg->msgdata.output_frame.offset),
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_qcom_media/227622.patch

@@ -1,4 +1,4 @@
-From 742cf6ad5c74b71063af755b7ef7df2a3a2f19a3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Santhosh Behara <santhoshbehara@codeaurora.org>
 Date: Tue, 15 May 2018 06:09:50 -0700
 Subject: [PATCH] mm-video-v4l2: Protect buffer access and increase input
@@ -190,3 +190,6 @@ index d1311f6ce..11b882aac 100644
                          memcpy ( omxhdr->pBuffer, (void *)
                                  ((unsigned long)vdec_msg->msgdata.output_frame.bufferaddr +
                                   (unsigned long)vdec_msg->msgdata.output_frame.offset),
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_qcom_media/229950.patch

@@ -1,4 +1,4 @@
-From f42b03df24d3acd5caaa2628c206c591ccc023eb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ray Essick <essick@google.com>
 Date: Mon, 2 Jul 2018 16:00:09 -0700
 Subject: [PATCH] mm-video-v4l2: Protect buffer access and increase input
@@ -177,3 +177,6 @@ index 9d041e990..003cd9b56 100644
                          vdec_msg->msgdata.output_frame.bufferaddr)
                          memcpy ( omxhdr->pBuffer, (void *)
                                  ((unsigned long)vdec_msg->msgdata.output_frame.bufferaddr +
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_qcom_media/229951.patch

@@ -1,4 +1,4 @@
-From 603c2ff8064e479640a45c04f0f9a307e465f63d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ray Essick <essick@google.com>
 Date: Fri, 29 Jun 2018 14:12:19 -0700
 Subject: [PATCH] mm-video-v4l2: Squash below changes
@@ -173,3 +173,6 @@ index 99b0c6e78..cfb72d83b 100644
                         vdec_msg->msgdata.output_frame.bufferaddr)
                         memcpy ( omxhdr->pBuffer, (void *)
                                 ((unsigned long)vdec_msg->msgdata.output_frame.bufferaddr +
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_ti_omap4/0001-tuna-camera.patch

@@ -1,4 +1,4 @@
-From a683d613d24bb84ba029fa78e1d7722b0270c326 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kyle Repinski <repinski23@gmail.com>
 Date: Fri, 9 Sep 2016 16:29:40 -0500
 Subject: [PATCH] camera: Move tuna DCC path to /data/misc/cameraserver/ on N.
@@ -62,3 +62,6 @@ index 74dcec1..f2bfd39 100644
  ifdef TI_CAMERAHAL_USES_LEGACY_DOMX_DCC
  	LOCAL_CFLAGS += -DUSES_LEGACY_DOMX_DCC
  endif
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_ti_wlan/209209.patch

@@ -1,4 +1,4 @@
-From 31b3f58bfdf3cdd0017f9aa5f57e56731d2c4980 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Guy Mishol <guym@ti.com>
 Date: Sun, 24 Dec 2017 15:06:24 +0200
 Subject: [PATCH] wl12xx: Update SR and MR firmwares versions
@@ -8950,3 +8950,6 @@ zijpNIOIO+!E?rpWOrFNcr;GhCw^<=x6~~2Uh!078Rur!+DN9>X{8UMqgH8U4D!G6>
 zv0N5h>QPd#YH3Msv2bFnELl;;zV-usjC*#D*moo=zDwh|Eo;PCzHIm$aWQwLQfwc|
 YHqQ{xVh<b^hj9AC;*GwcivRobzeh5;4*&oF
 
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_hardware_ti_wlan/209210.patch

@@ -1,4 +1,4 @@
-From f1bed9ca5d14303240b8814641d0e05291aeccbc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Guy Mishol <guym@ti.com>
 Date: Tue, 23 Jan 2018 12:57:51 +0200
 Subject: [PATCH] wl12xx: Update SR PLT firmwares
@@ -7374,3 +7374,6 @@ zY%$#i@pS4djaiPN&#s*~IE9i8d12%%m*E*F+Nv84w}(4$!<R;R%VCB&VdU_@;exh+
 z#(J^DG|A(YEywfA!P*?lE))Y|<r(UhGkkUsC$5wp7Te3xQIWd<OW${;$t#T_Fm*0n
 bU#T@c<%o0>c`u%phDaD?>GH0dd;j}C?50qK
 
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_packages_apps_CMParts/0001-Remove_Analytics.patch

@@ -1,4 +1,4 @@
-From 911b31c6e3cf5783d047de59a085de369ebf5779 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 8 Feb 2017 15:05:02 -0500
 Subject: [PATCH] Remove analytics
@@ -14,10 +14,10 @@ Change-Id: Ic01c97d6ceac8d324609763973639b41b4581a76
  6 files changed, 64 deletions(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 3c58c3f..914a9df 100644
+index a560cb6..63cecc6 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
-@@ -183,31 +183,6 @@
+@@ -184,31 +184,6 @@
                  android:value="status_bar_settings" />
          </activity-alias>
  
@@ -62,7 +62,7 @@ index 733d5d9..58addff 100644
  -keep class org.cyanogenmod.cmparts.hardware.*
  -keep class org.cyanogenmod.cmparts.input.*
 diff --git a/res/values/config.xml b/res/values/config.xml
-index 2980816..a5729c6 100644
+index 24d9c64..27f3f3f 100644
 --- a/res/values/config.xml
 +++ b/res/values/config.xml
 @@ -17,9 +17,6 @@
@@ -76,10 +76,10 @@ index 2980816..a5729c6 100644
      <bool name="config_showWeatherMenu">true</bool>
  
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index c13655e..6891213 100644
+index dc0ceb0..9cba5f2 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -482,28 +482,6 @@
+@@ -533,28 +533,6 @@
                   <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                   <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
  
@@ -142,5 +142,5 @@ index 5ae923a..45df2a1 100644
 -
  </PreferenceScreen>
 -- 
-2.9.3
+2.31.1
 

Patches/LineageOS-14.1/android_packages_apps_CMParts/0002-Reduced_Resolution.patch

@@ -1,20 +1,20 @@
-From a1e8c666a77d575c8d78a0d1269b3d06a7cb5d41 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Sat, 21 Oct 2017 09:05:09 -0400
 Subject: [PATCH] Reduced Resolution Feature 1/2
 
 Change-Id: I925a23e61ebf3ce06dc78898952085d87ad10410
 ---
- res/values/strings.xml                                  |  3 +++
+ res/values/strings.xml                          |  3 +++
- res/xml/perf_profile_settings.xml                       |  6 ++++++
+ res/xml/perf_profile_settings.xml               |  6 ++++++
- .../cyanogenmod/cmparts/power/PerfProfileSettings.java  | 17 +++++++++++++++++
+ .../cmparts/power/PerfProfileSettings.java      | 17 +++++++++++++++++
  3 files changed, 26 insertions(+)
 
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 21b8b78..1fee482 100644
+index 9cba5f2..e05168f 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -576,6 +576,9 @@
+@@ -574,6 +574,9 @@
      <string name="power_save_category_title">Battery saving</string>
      <string name="power_save_title">Extreme power saver</string>
      <string name="power_save_summary">Restrict device performance and background activity to save power</string>
@@ -103,5 +103,5 @@ index ec2138d..5fdc8f1 100644
          final int level = Global.getInt(
                  getContentResolver(), Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
 -- 
-2.14.2
+2.31.1
 

Patches/LineageOS-14.1/android_packages_apps_PackageInstaller/64d8b44.patch

@@ -1,6 +1,6 @@
-From 64d8b44f6625292bc4a5f90913713e97fc4a0032 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
-Date: Sun, 06 Aug 2017 10:27:32 -0400
+Date: Sun, 6 Aug 2017 10:27:32 -0400
 Subject: [PATCH] fix toggling off current permissions in review
 
 The confirmPermissionsReview function currently only takes into account
@@ -12,12 +12,14 @@ thinking they've toggled off a permission that they haven't.
 
 Change-Id: I84310a1c20981a239169069a881dbb79267d784f
 ---
+ .../ui/ReviewPermissionsActivity.java         | 53 +++++++++++--------
+ 1 file changed, 31 insertions(+), 22 deletions(-)
 
 diff --git a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java
-index 6bc251a..b6fd0c1 100644
+index 6bc251aed..b6fd0c161 100644
 --- a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java
 +++ b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,7 @@ import com.android.packageinstaller.permission.model.AppPermissions;
  import com.android.packageinstaller.permission.utils.Utils;
  import com.android.packageinstaller.permission.ui.ConfirmActionDialogFragment.OnActionConfirmedListener;
  
@@ -25,7 +27,7 @@ index 6bc251a..b6fd0c1 100644
  import java.util.List;
  
  public final class ReviewPermissionsActivity extends Activity
-@@ -103,6 +104,7 @@
+@@ -103,6 +104,7 @@ public final class ReviewPermissionsActivity extends Activity
          private Button mCancelButton;
  
          private PreferenceCategory mNewPermissionsCategory;
@@ -33,20 +35,13 @@ index 6bc251a..b6fd0c1 100644
  
          private boolean mHasConfirmedRevoke;
  
-@@ -218,22 +220,29 @@
+@@ -218,22 +220,29 @@ public final class ReviewPermissionsActivity extends Activity
          }
  
          private void confirmPermissionsReview() {
 -            PreferenceGroup preferenceGroup = mNewPermissionsCategory != null
 -                ? mNewPermissionsCategory : getPreferenceScreen();
-+            final List<PreferenceGroup> preferenceGroups = new ArrayList<PreferenceGroup>();
+-
-+            if (mNewPermissionsCategory != null) {
-+                preferenceGroups.add(mNewPermissionsCategory);
-+                preferenceGroups.add(mCurrentPermissionsCategory);
-+            } else {
-+                preferenceGroups.add(getPreferenceScreen());
-+            }
- 
 -            final int preferenceCount = preferenceGroup.getPreferenceCount();
 -            for (int i = 0; i < preferenceCount; i++) {
 -                Preference preference = preferenceGroup.getPreference(i);
@@ -58,6 +53,14 @@ index 6bc251a..b6fd0c1 100644
 -                        group.grantRuntimePermissions(false);
 -                    } else {
 -                        group.revokeRuntimePermissions(false);
++            final List<PreferenceGroup> preferenceGroups = new ArrayList<PreferenceGroup>();
++            if (mNewPermissionsCategory != null) {
++                preferenceGroups.add(mNewPermissionsCategory);
++                preferenceGroups.add(mCurrentPermissionsCategory);
++            } else {
++                preferenceGroups.add(getPreferenceScreen());
++            }
++
 +            for (PreferenceGroup preferenceGroup : preferenceGroups) {
 +                final int preferenceCount = preferenceGroup.getPreferenceCount();
 +                for (int i = 0; i < preferenceCount; i++) {
@@ -77,7 +80,7 @@ index 6bc251a..b6fd0c1 100644
                  }
              }
          }
-@@ -295,7 +304,7 @@
+@@ -295,7 +304,7 @@ public final class ReviewPermissionsActivity extends Activity
                  screen.removeAll();
              }
  
@@ -86,7 +89,7 @@ index 6bc251a..b6fd0c1 100644
              PreferenceGroup oldNewPermissionsCategory = mNewPermissionsCategory;
              mNewPermissionsCategory = null;
  
-@@ -353,13 +362,13 @@
+@@ -353,13 +362,13 @@ public final class ReviewPermissionsActivity extends Activity
                          mNewPermissionsCategory.addPreference(preference);
                      }
                  } else {
@@ -106,3 +109,6 @@ index 6bc251a..b6fd0c1 100644
                  }
              }
          }
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch

@@ -1,4 +1,4 @@
-From d6e3b804873c9bdfb4126a9bf9a56f2b7da88ffe Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe <mse1969@posteo.de>
 Date: Sat, 22 Sep 2018 16:20:36 +0200
 Subject: [PATCH] Settings / Data usage: Add menu option to switch off captive
@@ -33,10 +33,10 @@ index f4c207b767..e47c3b25fc 100644
 +        android:checkable="true" />
  </menu>
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index f18d6d2c47..1039ea4e19 100644
+index 0dd77d2439..d581b975fe 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
-@@ -511,4 +511,9 @@
+@@ -516,4 +516,9 @@
      <!-- Burn in protection -->
      <string name="burnin_protection_title">Display burn-in protection</string>
      <string name="burnin_protection_summary">Periodically move items that are permanently shown on screen to avoid excessive screen wear in that area</string>
@@ -50,7 +50,7 @@ diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android
 index ece64b4310..cd4579a487 100644
 --- a/src/com/android/settings/ResetNetworkConfirm.java
 +++ b/src/com/android/settings/ResetNetworkConfirm.java
-@@ -25,6 +25,7 @@
+@@ -25,6 +25,7 @@ import android.net.wifi.WifiManager;
  import android.os.Bundle;
  import android.os.UserHandle;
  import android.os.UserManager;
@@ -58,7 +58,7 @@ index ece64b4310..cd4579a487 100644
  import android.telephony.SubscriptionManager;
  import android.telephony.TelephonyManager;
  import android.view.LayoutInflater;
-@@ -105,6 +106,9 @@ public void onClick(View v) {
+@@ -105,6 +106,9 @@ public class ResetNetworkConfirm extends OptionsMenuFragment {
  
              ImsManager.factoryReset(context);
  
@@ -84,7 +84,7 @@ index 702e6db0ae..98df2759b2 100644
  import android.content.Intent;
  import android.content.ActivityNotFoundException;
  import android.net.ConnectivityManager;
-@@ -28,6 +31,7 @@
+@@ -28,6 +31,7 @@ import android.os.RemoteException;
  import android.os.SystemProperties;
  import android.os.UserManager;
  import android.provider.SearchIndexableResource;
@@ -92,7 +92,7 @@ index 702e6db0ae..98df2759b2 100644
  import android.support.v7.preference.Preference;
  import android.support.v7.preference.PreferenceScreen;
  import android.telephony.SubscriptionInfo;
-@@ -59,7 +63,9 @@
+@@ -59,7 +63,9 @@ import java.util.List;
  import static android.net.ConnectivityManager.TYPE_ETHERNET;
  import static android.net.ConnectivityManager.TYPE_WIFI;
  
@@ -103,7 +103,7 @@ index 702e6db0ae..98df2759b2 100644
  
      private static final String TAG = "DataUsageSummary";
      static final boolean LOGD = false;
-@@ -77,6 +83,7 @@
+@@ -77,6 +83,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
      private Preference mLimitPreference;
      private NetworkTemplate mDefaultTemplate;
      private int mDataUsageTemplate;
@@ -111,7 +111,7 @@ index 702e6db0ae..98df2759b2 100644
  
      @Override
      protected int getHelpResource() {
-@@ -135,6 +142,7 @@ public void onCreate(Bundle icicle) {
+@@ -135,6 +142,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
      public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
          if (UserManager.get(getContext()).isAdminUser()) {
              inflater.inflate(R.menu.data_usage, menu);
@@ -119,7 +119,7 @@ index 702e6db0ae..98df2759b2 100644
          }
          super.onCreateOptionsMenu(menu, inflater);
      }
-@@ -143,6 +151,8 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+@@ -143,6 +151,8 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
      public void onPrepareOptionsMenu(Menu menu) {
          final Context context = getActivity();
          final MenuItem networkaccess = menu.findItem(R.id.data_usage_menu_app_network_access);
@@ -128,7 +128,7 @@ index 702e6db0ae..98df2759b2 100644
          if (networkaccess == null) {
              return;
          }
-@@ -177,6 +187,22 @@ public boolean onOptionsItemSelected(MenuItem item) {
+@@ -177,6 +187,22 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
                  }
                  return true;
              }
@@ -151,7 +151,7 @@ index 702e6db0ae..98df2759b2 100644
          }
          return false;
      }
-@@ -190,6 +216,35 @@ public boolean onPreferenceTreeClick(Preference preference) {
+@@ -190,6 +216,35 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
          return super.onPreferenceTreeClick(preference);
      }
  
@@ -187,3 +187,6 @@ index 702e6db0ae..98df2759b2 100644
      private void addMobileSection(int subId) {
          TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                  inflatePreferences(R.xml.data_usage_cellular);
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_packages_apps_Settings/0002-Sensors-P1.patch

@@ -1,7 +1,7 @@
-From 2180a97b8aafc377c52cff014e44ea173f30db87 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe <mse1969@posteo.de>
 Date: Mon, 26 Feb 2018 18:01:44 +0100
-Subject: [PATCH 1/2] - AppOps/PrivacyGuard: New Sensor checks [Settings]
+Subject: [PATCH] - AppOps/PrivacyGuard: New Sensor checks [Settings]
 
 Add two AppOps for sensor access:
 - OP_MOTION_SENSORS (default: allow, strict)
@@ -79,7 +79,7 @@ index 395b87195c..b5e9213441 100644
      <string name="app_ops_permissions_allowed">Autorisé</string>
      <string name="app_ops_permissions_ignored">Ignoré</string>
 diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
-index 38568e4baf..f6a2e8ad19 100644
+index 49e2a4f2d1..6695d291ed 100644
 --- a/res/values/cm_arrays.xml
 +++ b/res/values/cm_arrays.xml
 @@ -50,6 +50,7 @@
@@ -109,7 +109,7 @@ index 38568e4baf..f6a2e8ad19 100644
  
      <!-- App ops permissions -->
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index 0dd77d2439..6441556fa4 100644
+index d581b975fe..5e06f4a01c 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
 @@ -70,6 +70,7 @@

Patches/LineageOS-14.1/android_packages_apps_Settings/0002-Sensors-P2.patch

@@ -1,8 +1,7 @@
-From 52752e68d5307d6a5421fb48a754b6f93d622454 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe <mse1969@posteo.de>
 Date: Wed, 10 Apr 2019 22:11:15 +0200
-Subject: [PATCH 2/2] AppOps details: Add permission icons for new Sensor
+Subject: [PATCH] AppOps details: Add permission icons for new Sensor AppOps
- AppOps
 
 Change-Id: Ic68954f30ba8214041c685a4efca4fc65b99ddaf
 ---

Patches/LineageOS-14.1/android_packages_apps_Settings/201113.patch

@@ -1,4 +1,4 @@
-From 04cfd27db79e5ca78e03c64c82144261f92cc365 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: syphyr <syphyr@gmail.com>
 Date: Wed, 3 Jan 2018 20:15:17 +0100
 Subject: [PATCH] wifi: Add world regulatory domain country code
@@ -18,10 +18,10 @@ Change-Id: I2e519872954903575ac2fc47fa13d126bb5bac8e
  1 file changed, 2 insertions(+)
 
 diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
-index 476b1c22ef..914c0b4fc3 100644
+index 38568e4baf..49e2a4f2d1 100644
 --- a/res/values/cm_arrays.xml
 +++ b/res/values/cm_arrays.xml
-@@ -268,6 +268,7 @@
+@@ -269,6 +269,7 @@
  
      <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi region code. -->
      <string-array name="wifi_countrycode_entries">
@@ -29,7 +29,7 @@ index 476b1c22ef..914c0b4fc3 100644
          <item>United States</item>
          <item>Canada, Taiwan</item>
          <item>Germany</item>
-@@ -283,6 +284,7 @@
+@@ -284,6 +285,7 @@
      </string-array>
  
      <string-array name="wifi_countrycode_values" translatable="false">
@@ -37,3 +37,6 @@ index 476b1c22ef..914c0b4fc3 100644
          <item>US</item>
          <item>CA</item>
          <item>DE</item>
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch

@@ -1,14 +1,14 @@
-From 2d5570d86d6eb950247a5b4792840c1626eaea94 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 18 Oct 2017 11:54:48 -0400
 Subject: [PATCH] Remove analytics
 
 Change-Id: I044dd6b137b8a1d4a6dde3a63c0aaa454309341f
 ---
- res/layout/setup_lineage_settings.xml              | 36 ----------------------
+ res/layout/setup_lineage_settings.xml         | 36 -------------------
- .../cyanogenmod/setupwizard/FinishActivity.java    | 12 --------
+ .../setupwizard/FinishActivity.java           | 12 -------
- .../setupwizard/LineageSettingsActivity.java       | 35 ---------------------
+ .../setupwizard/LineageSettingsActivity.java  | 35 ------------------
- .../cyanogenmod/setupwizard/SetupWizardApp.java    |  1 -
+ .../setupwizard/SetupWizardApp.java           |  1 -
  4 files changed, 84 deletions(-)
 
 diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml
@@ -189,5 +189,5 @@ index f10a917..f916f5b 100644
      public static final String KEY_APPLY_DEFAULT_THEME = "apply_default_theme";
      public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
 -- 
-2.14.2
+2.31.1
 

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

@@ -1,4 +1,4 @@
-From 2dbae8b963b4872a9f9a5d7501edebe04a432ca3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Thu, 20 Sep 2018 21:44:53 -0400
 Subject: [PATCH] Add support for routing over Tor
@@ -378,5 +378,5 @@ index a31492e..bea09ca 100644
          return server + "?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
      }
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-14.1/android_packages_services_Telephony/0001-PREREQ_Handle_All_Modes.patch

@@ -1,4 +1,4 @@
-From a14afb074cdf415565227f18e70489da0930a115 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Sat, 29 Dec 2018 06:58:18 -0500
 Subject: [PATCH] Change UpdateEnabledNetworksValueAndSummary to handle all
@@ -10,7 +10,7 @@ Change-Id: I25bab65a6b3743a05f2d76395e59dc3f241a14d3
  1 file changed, 11 insertions(+), 39 deletions(-)
 
 diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
-index d5c09924..75477ad2 100644
+index d5c099241..8241b9728 100644
 --- a/src/com/android/phone/MobileNetworkSettings.java
 +++ b/src/com/android/phone/MobileNetworkSettings.java
 @@ -1085,35 +1085,31 @@ public class MobileNetworkSettings extends PreferenceActivity
@@ -137,5 +137,5 @@ index d5c09924..75477ad2 100644
  
      @Override
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-14.1/android_packages_services_Telephony/0002-More_Preferred_Network_Modes.patch

@@ -1,4 +1,4 @@
-From b0eaecdfeeaedc39ec8af6799572c7d549b59f8b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Sat, 29 Dec 2018 07:05:47 -0500
 Subject: [PATCH] More preferred network modes
@@ -10,7 +10,7 @@ Change-Id: Ibd97b5209c002547da714cb176094fee57a18f6d
  2 files changed, 74 insertions(+), 4 deletions(-)
 
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 5be5e1c7..b8c4b9c6 100644
+index 5be5e1c79..b8c4b9c69 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
 @@ -423,6 +423,8 @@
@@ -179,7 +179,7 @@ index 5be5e1c7..b8c4b9c6 100644
          <item>"1"</item>
      </string-array>
 diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
-index 8241b972..8f926bd3 100644
+index 8241b9728..8f926bd36 100644
 --- a/src/com/android/phone/MobileNetworkSettings.java
 +++ b/src/com/android/phone/MobileNetworkSettings.java
 @@ -831,8 +831,11 @@ public class MobileNetworkSettings extends PreferenceActivity
@@ -258,5 +258,5 @@ index 8241b972..8f926bd3 100644
                      mButtonEnabledNetworks.setSummary(R.string.network_global);
                  }
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-14.1/android_system_bt/0001-NO_READENCRKEYSIZE.patch

@@ -1,4 +1,4 @@
-From 6e68de32ff6200410d83d6ee7b2c91cb244f03d4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 6 Oct 2021 05:26:50 -0400
 Subject: [PATCH] Add an option to disable the assert added in fc2ca9ee

Patches/LineageOS-14.1/android_system_bt/229574.patch

@@ -1,4 +1,4 @@
-From 0d87e15abda69a93df1cd4d854088e2ccac01033 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: ValdikSS <iam@valdikss.org.ru>
 Date: Fri, 21 Sep 2018 13:53:11 +0300
 Subject: [PATCH] Increase maximum Bluetooth SBC codec bitrate for SBC HD
@@ -48,3 +48,6 @@ index 977d2668d..cac0c2211 100644
  
  /* 2DH5 payload size of 679 bytes - (4 bytes L2CAP Header + 12 bytes AVDTP Header) */
  #define MAX_2MBPS_AVDTP_MTU         663
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_system_bt/229575.patch

@@ -1,4 +1,4 @@
-From d398566dd742fee9bd08d5ba0ac245aec1258afd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: ValdikSS <iam@valdikss.org.ru>
 Date: Fri, 21 Sep 2018 21:43:14 +0300
 Subject: [PATCH] Explicit SBC Dual Channel (SBC HD) support
@@ -165,3 +165,6 @@ index cac0c2211..4c956bd3c 100644
      }
  
      return rate;
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_system_bt/242134.patch

@@ -1,4 +1,4 @@
-From b31e5b89a84b8ae992c818184fa3bb9d288db69d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cprhokie <cprhokie@gmail.com>
 Date: Fri, 22 Feb 2019 20:53:12 -0500
 Subject: [PATCH] avrc_bld_get_attrs_rsp - fix attribute length position off by
@@ -10,7 +10,7 @@ Change-Id: I60c859ef9784cf39d390a22810be5777e1e5066c
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/stack/avrc/avrc_bld_tg.c b/stack/avrc/avrc_bld_tg.c
-index 089dfa3ae..8c16e01a6 100644
+index 5befa7a10..b73393182 100644
 --- a/stack/avrc/avrc_bld_tg.c
 +++ b/stack/avrc/avrc_bld_tg.c
 @@ -976,7 +976,8 @@ static tAVRC_STS avrc_bld_get_attrs_rsp (tAVRC_GET_ATTRS_RSP *p_rsp, BT_HDR *p_p
@@ -23,3 +23,6 @@ index 089dfa3ae..8c16e01a6 100644
      /* the existing len */
      BE_STREAM_TO_UINT16(len, p_data);
      p_num = p_data + 1;
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_system_core/0001-Harden.patch

@@ -1,4 +1,4 @@
-From edd233257b7a76ff0e1f6251339caccbc7c5afbd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 28 Jun 2017 07:54:49 -0400
 Subject: [PATCH] Harden
@@ -6,8 +6,8 @@ Subject: [PATCH] Harden
 Change-Id: I46e3fc4ac896a509ab8ca90ae4ce09b820da434b
 ---
  init/init.cpp   |  6 +++---
- rootdir/init.rc | 12 ++++++++++++
+ rootdir/init.rc | 11 +++++++++++
- 2 files changed, 15 insertions(+), 3 deletions(-)
+ 2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/init/init.cpp b/init/init.cpp
 index 7a370596e..35bf44a7b 100755
@@ -28,6 +28,7 @@ index 7a370596e..35bf44a7b 100755
  
      // We must have some place other than / to create the device nodes for
 diff --git a/rootdir/init.rc b/rootdir/init.rc
+index 40a36402e..4abc6d1a8 100644
 --- a/rootdir/init.rc
 +++ b/rootdir/init.rc
 @@ -126,6 +126,17 @@ on init
@@ -49,5 +50,5 @@ diff --git a/rootdir/init.rc b/rootdir/init.rc
      write /proc/sys/vm/mmap_min_addr 32768
      write /proc/sys/net/ipv4/ping_group_range "0 2147483647"
 -- 
-2.26.2
+2.31.1
 

Patches/LineageOS-14.1/android_system_sepolicy/0001-LGE_Fixes.patch

@@ -1,4 +1,4 @@
-From af2b9266040c9b7abd4f24fd587ac935350f1843 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 27 Jun 2018 20:48:25 -0400
 Subject: [PATCH] Fix -user builds for many LGE devices
@@ -9,7 +9,7 @@ Change-Id: I3649cf211a356c57e129fbda1f5184a4bebc85af
  1 file changed, 4 insertions(+)
 
 diff --git a/domain.te b/domain.te
-index 59de1f1..d165127 100644
+index 59de1f129..d165127fa 100644
 --- a/domain.te
 +++ b/domain.te
 @@ -361,6 +361,9 @@ neverallow { domain -recovery -update_engine } system_block_device:blk_file writ
@@ -31,5 +31,5 @@ index 59de1f1..d165127 100644
  
  # Only servicemanager should be able to register with binder as the context manager
 -- 
-2.18.0
+2.31.1
 

Patches/LineageOS-14.1/android_system_sepolicy/248600.patch

@@ -1,4 +1,4 @@
-From 14f74809348227ad07d1d934d747f7218c7e21a3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Fri, 29 Jul 2016 14:48:19 -0400
 Subject: [PATCH] restrict access to timing information in /proc
@@ -129,3 +129,6 @@ index db59b6573..334cb9144 100644
  # Read /sys/kernel/debug/wakeup_sources.
  allow system_server debugfs:file r_file_perms;
  
+-- 
+2.31.1
+

Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch

@@ -1,4 +1,4 @@
-From 2206aff4757e0f1094861f0e9505d1b5ddbf3236 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 3 Jan 2018 11:55:06 -0500
 Subject: [PATCH] Build time variable for AES-256 encryption
@@ -25,7 +25,7 @@ index e645574..7112dce 100644
  
  include $(CLEAR_VARS)
 diff --git a/cryptfs.c b/cryptfs.c
-index b25510f..86ffac3 100644
+index 0ae9d9f..6141624 100644
 --- a/cryptfs.c
 +++ b/cryptfs.c
 @@ -76,9 +76,17 @@
@@ -62,5 +62,5 @@ index b25510f..86ffac3 100644
  char *me = "cryptfs";
  
 -- 
-2.15.1
+2.31.1
 

Patches/LineageOS-15.1/android_bootable_recovery/0001-Remove_Logo.patch

@@ -1,4 +1,4 @@
-From 05eea0579312ffc9d0691ae06b6a09165ecd110e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Tue, 24 Apr 2018 12:13:43 -0400
 Subject: [PATCH] Remove logo
@@ -10,7 +10,7 @@ Change-Id: Ibf900e6ceb8a571b4770f6df7efeea1d97b6b477
  2 files changed, 9 deletions(-)
 
 diff --git a/screen_ui.cpp b/screen_ui.cpp
-index 190aaf33..1908885a 100644
+index 30d6a939..f01574c1 100644
 --- a/screen_ui.cpp
 +++ b/screen_ui.cpp
 @@ -506,13 +506,6 @@ void ScreenRecoveryUI::draw_header_locked(int& y) {
@@ -27,7 +27,7 @@ index 190aaf33..1908885a 100644
    y += v_unit * 4;
  
    y += v_unit * 1; // Margin
-@@ -811,7 +804,6 @@ bool ScreenRecoveryUI::Init(const std::string& locale) {
+@@ -816,7 +809,6 @@ bool ScreenRecoveryUI::Init(const std::string& locale) {
    text_col_ = text_row_ = 0;
    text_top_ = 1;
  
@@ -48,5 +48,5 @@ index be54994a..f6c3713f 100644
    GRSurface* ic_back_sel;
  
 -- 
-2.17.0
+2.31.1
 

Patches/LineageOS-15.1/android_build/0001-OTA_Keys.patch

@@ -1,4 +1,4 @@
-From 6b2e3eb190363d4e5957890826e97f5674b38539 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 5 Apr 2021 23:03:18 -0400
 Subject: [PATCH] Allow setting OTA public keys from environment variable
@@ -10,7 +10,7 @@ Change-Id: Ie7edd059b8d701d5ec0d0d922e23d034f69e579f
  2 files changed, 9 insertions(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index f2a524d58..92c7928d3 100644
+index f2a524d58c..92c7928d35 100644
 --- a/core/Makefile
 +++ b/core/Makefile
 @@ -1217,6 +1217,10 @@ endif
@@ -25,7 +25,7 @@ index f2a524d58..92c7928d3 100644
  # recovery binary.
  RECOVERY_INSTALL_OTA_KEYS := \
 diff --git a/core/product_config.mk b/core/product_config.mk
-index bcab7a384..401d27054 100644
+index bcab7a384c..401d270542 100644
 --- a/core/product_config.mk
 +++ b/core/product_config.mk
 @@ -404,6 +404,11 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \
@@ -41,5 +41,5 @@ index bcab7a384..401d27054 100644
      $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))
  PRODUCT_DEX_PREOPT_BOOT_FLAGS := \
 -- 
-2.30.2
+2.31.1
 

Patches/LineageOS-15.1/android_build/0002-Enable_fwrapv.patch

@@ -1,4 +1,4 @@
-From f699532069f985837f61c43cd7697869890672ea Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Tue, 13 Sep 2016 22:05:56 -0400
 Subject: [PATCH] use -fwrapv when signed overflow checking is off
@@ -8,7 +8,7 @@ Subject: [PATCH] use -fwrapv when signed overflow checking is off
  1 file changed, 6 insertions(+)
 
 diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
-index 70cb456a5..705bcb1ef 100644
+index 70cb456a56..705bcb1ef7 100644
 --- a/core/config_sanitizers.mk
 +++ b/core/config_sanitizers.mk
 @@ -308,3 +308,9 @@ ifneq ($(my_sanitize_diag),)

Patches/LineageOS-15.1/android_build_soong/0001-Enable_fwrapv.patch

@@ -1,4 +1,4 @@
-From 2b6950b03eb3d8cc82fa2b0a91db480dacf58a78 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 23 Aug 2017 20:28:03 -0400
 Subject: [PATCH] use -fwrapv when signed overflow checking is off
@@ -9,7 +9,7 @@ Subject: [PATCH] use -fwrapv when signed overflow checking is off
  2 files changed, 14 insertions(+)
 
 diff --git a/cc/cc.go b/cc/cc.go
-index 983ffc0..45a50cf 100644
+index 983ffc0e8..45a50cfdf 100644
 --- a/cc/cc.go
 +++ b/cc/cc.go
 @@ -533,6 +533,8 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
@@ -22,7 +22,7 @@ index 983ffc0..45a50cf 100644
  	if c.coverage != nil {
  		flags = c.coverage.flags(ctx, flags)
 diff --git a/cc/sanitize.go b/cc/sanitize.go
-index 9c3b8e5..1dbd9fe 100644
+index 9c3b8e529..1dbd9fe11 100644
 --- a/cc/sanitize.go
 +++ b/cc/sanitize.go
 @@ -271,6 +271,7 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps {

Patches/LineageOS-15.1/android_device_qcom_sepolicy/0001-Camera_Fix.patch

@@ -1,4 +1,4 @@
-From 41c2cb884b69e04e2e7a6404b580aafc4b2ceba7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 12 Feb 2018 02:41:09 -0500
 Subject: [PATCH] TEMPORARY fix camera not working on user builds
@@ -9,7 +9,7 @@ Change-Id: I61e8c78bfd70be7c157c049dac201de21749d4a2
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/common/mediaserver.te b/common/mediaserver.te
-index 1108551..6b92565 100755
+index 1108551e..6b925655 100755
 --- a/common/mediaserver.te
 +++ b/common/mediaserver.te
 @@ -13,12 +13,10 @@ binder_call(mediaserver, rild)
@@ -30,5 +30,5 @@ index 1108551..6b92565 100755
  r_dir_file(mediaserver, sysfs_esoc)
  #allow mediaserver system_app_data_file:file rw_file_perms;
 -- 
-2.16.1
+2.31.1
 

Patches/LineageOS-15.1/android_frameworks_base/0006-Disable_Analytics.patch

@@ -1,4 +1,4 @@
-From 5b59a2cf8028488847a5cd6ac7d4a14414972438 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 21 May 2018 04:23:40 -0400
 Subject: [PATCH] Disable/reduce functionality of various ad/analytics
@@ -6,11 +6,11 @@ Subject: [PATCH] Disable/reduce functionality of various ad/analytics
 
 Change-Id: I84303ee26d0232e471f44ae6eff6e41a2210e42e
 ---
- core/java/android/content/pm/PackageParser.java | 12 ++++++++++++
+ core/java/android/content/pm/PackageParser.java | 14 ++++++++++++++
- 1 file changed, 12 insertions(+)
+ 1 file changed, 14 insertions(+)
 
 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index 8c66fb227cf..31368bf74b1 100644
+index 8c66fb227cf9..a5c783597b34 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
 @@ -5524,6 +5524,20 @@ public class PackageParser {
@@ -35,5 +35,5 @@ index 8c66fb227cf..31368bf74b1 100644
  
          String name = sa.getNonConfigurationString(
 -- 
-2.17.0
+2.31.1
 

Patches/LineageOS-15.1/android_frameworks_base/0007-Sensors.patch

@@ -1,4 +1,4 @@
-From 846d74b9b422a0c616c024e63bcfee3f6454a3c3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Sun, 17 Jun 2018 10:49:09 +0200
 Subject: [PATCH] - AppOps/PrivacyGuard: New Sensor checks [base]

Patches/LineageOS-15.1/android_frameworks_native/0001-Sensors.patch

@@ -1,7 +1,7 @@
-From cf5355b4ffb23b30b45a937d907e4a728214b02a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Sun, 17 Jun 2018 11:33:33 +0200
-Subject: [PATCH] [PATCH 2/3] - AppOps/PrivacyGuard: New Sensor checks [native]
+Subject: [PATCH] - AppOps/PrivacyGuard: New Sensor checks [native]
 
 Add two AppOps for sensor access:
 - OP_MOTION_SENSORS (default: ask, strict)
@@ -22,7 +22,7 @@ diff --git a/libs/binder/include/binder/AppOpsManager.h b/libs/binder/include/bi
 index 1beabd3fc4..dd7b3482f3 100644
 --- a/libs/binder/include/binder/AppOpsManager.h
 +++ b/libs/binder/include/binder/AppOpsManager.h
-@@ -110,7 +110,9 @@ class AppOpsManager
+@@ -110,7 +110,9 @@ public:
          OP_BOOT_COMPLETED = 72,
          OP_NFC_CHANGE = 73,
          OP_DATA_CONNECT_CHANGE = 74,
@@ -34,7 +34,7 @@ index 1beabd3fc4..dd7b3482f3 100644
  
      AppOpsManager();
 diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
-index a0e368c7e4..919d5311c9 100644
+index 2383516c95..499b0686d0 100644
 --- a/libs/sensor/Sensor.cpp
 +++ b/libs/sensor/Sensor.cpp
 @@ -52,6 +52,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi
@@ -153,3 +153,6 @@ index a1f07b281a..1a0e5e8531 100644
      return true;
  }
  
+-- 
+2.31.1
+

Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch

@@ -1,4 +1,4 @@
-From 1112cabae9ee20b0b1386bc6c3bf0d1614ce8a6e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Thu, 19 Apr 2018 20:46:02 -0400
 Subject: [PATCH] Remove analytics
@@ -14,10 +14,10 @@ Change-Id: Idcc15bfeda4805b305423534663429942abd1bcf
  6 files changed, 59 deletions(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 237db74..26d4a34 100644
+index 69dbdae..8afff66 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
-@@ -251,31 +251,6 @@
+@@ -208,31 +208,6 @@
                  android:resource="@string/expanded_desktop_settings_summary" />
          </activity-alias>
  
@@ -76,10 +76,10 @@ index 4236b27..eed044a 100644
      <bool name="config_showWeatherMenu">true</bool>
  
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 3070c83..f3e27ed 100644
+index 42793e8..4bbc5a0 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -537,28 +537,6 @@
+@@ -545,28 +545,6 @@
                   <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                   <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
  
@@ -109,10 +109,10 @@ index 3070c83..f3e27ed 100644
      <string name="accelerometer_title">Auto-rotate screen</string>
      <string name="display_rotation_title">Rotation settings</string>
 diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
-index 66a3116..7721ed5 100644
+index 2ad4fdb..5a227cc 100644
 --- a/res/xml/parts_catalog.xml
 +++ b/res/xml/parts_catalog.xml
-@@ -74,11 +74,6 @@
+@@ -69,11 +69,6 @@
            android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings"
            lineage:xmlRes="@xml/status_bar_settings" />
  
@@ -125,7 +125,7 @@ index 66a3116..7721ed5 100644
            android:title="@string/power_menu_title"
            android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
 diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml
-index 2afae69..9c363a9 100644
+index f12fd7e..f4e696c 100644
 --- a/res/xml/trust_preferences.xml
 +++ b/res/xml/trust_preferences.xml
 @@ -46,9 +46,6 @@
@@ -139,5 +139,5 @@ index 2afae69..9c363a9 100644
              android:key="sms_security_check_limit"
              android:defaultValue="30"
 -- 
-2.17.1
+2.31.1
 

Patches/LineageOS-15.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch

@@ -1,4 +1,4 @@
-From b4ea75129c4e6d54059011e27c34a1e90bbd7f07 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Wed, 12 Sep 2018 19:37:38 +0200
 Subject: [PATCH] Settings / Data usage: Add menu option to switch off captive
@@ -54,7 +54,7 @@ diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android
 index f70d3c27ef..37dae5aa6c 100644
 --- a/src/com/android/settings/ResetNetworkConfirm.java
 +++ b/src/com/android/settings/ResetNetworkConfirm.java
-@@ -27,6 +27,7 @@
+@@ -27,6 +27,7 @@ import android.net.wifi.WifiManager;
  import android.os.Bundle;
  import android.os.UserHandle;
  import android.os.UserManager;
@@ -62,7 +62,7 @@ index f70d3c27ef..37dae5aa6c 100644
  import android.telephony.SubscriptionManager;
  import android.telephony.TelephonyManager;
  import android.view.LayoutInflater;
-@@ -108,6 +109,9 @@ public void onClick(View v) {
+@@ -108,6 +109,9 @@ public class ResetNetworkConfirm extends OptionsMenuFragment {
              ImsManager.factoryReset(context);
              restoreDefaultApn(context);
  
@@ -76,7 +76,7 @@ diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/
 index e37cc4a6c6..f5aba01b9c 100644
 --- a/src/com/android/settings/datausage/DataUsageSummary.java
 +++ b/src/com/android/settings/datausage/DataUsageSummary.java
-@@ -32,6 +32,7 @@
+@@ -32,6 +32,7 @@ import android.os.RemoteException;
  import android.os.SystemProperties;
  import android.os.UserManager;
  import android.provider.SearchIndexableResource;
@@ -84,7 +84,7 @@ index e37cc4a6c6..f5aba01b9c 100644
  import android.support.annotation.VisibleForTesting;
  import android.support.v7.preference.Preference;
  import android.support.v7.preference.PreferenceScreen;
-@@ -47,6 +48,8 @@
+@@ -47,6 +48,8 @@ import android.view.Menu;
  import android.view.MenuInflater;
  import android.view.MenuItem;
  import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -93,7 +93,7 @@ index e37cc4a6c6..f5aba01b9c 100644
  import com.android.settings.R;
  import com.android.settings.SummaryPreference;
  import com.android.settings.Utils;
-@@ -64,7 +67,8 @@
+@@ -64,7 +67,8 @@ import java.util.List;
   * This class in deprecated use {@link DataPlanUsageSummary}.
   */
  @Deprecated
@@ -103,7 +103,7 @@ index e37cc4a6c6..f5aba01b9c 100644
  
      static final boolean LOGD = false;
  
-@@ -94,6 +98,7 @@
+@@ -94,6 +98,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
      private NetworkRestrictionsPreference mNetworkRestrictionPreference;
      private WifiManager mWifiManager;
      private NetworkPolicyEditor mPolicyEditor;
@@ -111,7 +111,7 @@ index e37cc4a6c6..f5aba01b9c 100644
  
      @Override
      protected int getHelpResource() {
-@@ -105,6 +110,7 @@ public void onCreate(Bundle icicle) {
+@@ -105,6 +110,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
          super.onCreate(icicle);
  
          final Context context = getContext();
@@ -119,7 +119,7 @@ index e37cc4a6c6..f5aba01b9c 100644
          NetworkPolicyManager policyManager = NetworkPolicyManager.from(context);
          mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
          mPolicyEditor = new NetworkPolicyEditor(policyManager);
-@@ -162,6 +168,7 @@ public void onCreate(Bundle icicle) {
+@@ -162,6 +168,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
      public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
          if (UserManager.get(getContext()).isAdminUser()) {
              inflater.inflate(R.menu.data_usage, menu);
@@ -127,7 +127,7 @@ index e37cc4a6c6..f5aba01b9c 100644
          }
          super.onCreateOptionsMenu(menu, inflater);
      }
-@@ -176,6 +183,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
+@@ -176,6 +183,15 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
                  startActivity(intent);
                  return true;
              }
@@ -143,7 +143,7 @@ index e37cc4a6c6..f5aba01b9c 100644
          }
          return false;
      }
-@@ -189,6 +205,21 @@ public boolean onPreferenceTreeClick(Preference preference) {
+@@ -189,6 +205,21 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
          return super.onPreferenceTreeClick(preference);
      }
  
@@ -274,3 +274,6 @@ index 0000000000..208042ad73
 +     */
 +    void onCaptivePortalSwitchOffDialogConfirmed();
 +}
+-- 
+2.31.1
+

Patches/LineageOS-15.1/android_packages_apps_Settings/0004-PDB_Fixes.patch

@@ -1,4 +1,4 @@
-From e297ea5bd7bf902d6ed606c24cc0ab902dc6943b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 23 Apr 2018 15:40:11 -0400
 Subject: [PATCH] Fix crashes when the PersistentDataBlockManager service isn't
@@ -47,7 +47,7 @@ index 39bf01a0d9..8be58e8c85 100644
                  // if OEM unlock is allowed, the persistent data block will be wiped during FR
                  // process. If disabled, it will be wiped here, unless the device is still being
 diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
-index b29add1aa7..ac3d8a3273 100644
+index c66cf4c8d1..0ba99e42c2 100644
 --- a/src/com/android/settings/development/DevelopmentSettings.java
 +++ b/src/com/android/settings/development/DevelopmentSettings.java
 @@ -420,7 +420,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
@@ -63,5 +63,5 @@ index b29add1aa7..ac3d8a3273 100644
  
          mUm = (UserManager) getSystemService(Context.USER_SERVICE);
 -- 
-2.17.0
+2.31.1
 

Patches/LineageOS-15.1/android_packages_apps_Settings/0005-Sensors-P1.patch

@@ -1,7 +1,7 @@
-From f2eede97b47cf25553aa5edf10909429f087cfd9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Sun, 17 Jun 2018 13:03:27 +0200
-Subject: [PATCH 1/2] - AppOps/PrivacyGuard: New Sensor checks [Settings]
+Subject: [PATCH] - AppOps/PrivacyGuard: New Sensor checks [Settings]
 
 Add two AppOps for sensor access:
 - OP_MOTION_SENSORS (default: ask, strict)
@@ -109,7 +109,7 @@ index 901773fcc7..4796f9399c 100644
  
      <!-- App ops permissions -->
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index 91238336d9..f978f86bed 100644
+index 314074eff0..054805104b 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
 @@ -165,6 +165,7 @@

Patches/LineageOS-15.1/android_packages_apps_Settings/0005-Sensors-P2.patch

@@ -1,8 +1,7 @@
-From 4467cf678f558ee4b04fb1b9345a43f87b51d681 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Wed, 20 Mar 2019 08:42:49 +0100
-Subject: [PATCH 2/2] AppOps details: Add permission icons for new Sensor
+Subject: [PATCH] AppOps details: Add permission icons for new Sensor AppOps
- AppOps
 
 Change-Id: Ic68954f30ba8214041c685a4efca4fc65b99ddaf
 ---

Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch

@@ -1,4 +1,4 @@
-From 5222539b3e662164074da8fbc5bcb0ec0db9b361 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 28 Feb 2018 08:12:03 -0500
 Subject: [PATCH] Remove analytics
@@ -96,7 +96,7 @@ index 463e67d..74b0dba 100644
          Bundle mPrivacyData = setupWizardApp.getSettingsBundle();
          if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) {
 diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
-index d4579cf..dc3d4c8 100644
+index 6735202..8d62fca 100644
 --- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
 +++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
 @@ -19,7 +19,6 @@ package org.lineageos.setupwizard;
@@ -126,7 +126,7 @@ index d4579cf..dc3d4c8 100644
      private View.OnClickListener mNavKeysClickListener = view -> {
          boolean checked = !mNavKeys.isChecked();
          mNavKeys.setChecked(checked);
-@@ -108,19 +100,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
+@@ -110,19 +102,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
          privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance());
          privacyPolicy.setText(ss);
  
@@ -146,7 +146,7 @@ index d4579cf..dc3d4c8 100644
          View navKeysRow = findViewById(R.id.nav_keys);
          navKeysRow.setOnClickListener(mNavKeysClickListener);
          mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox);
-@@ -149,7 +128,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
+@@ -151,7 +130,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
      public void onResume() {
          super.onResume();
          updateDisableNavkeysOption();
@@ -154,7 +154,7 @@ index d4579cf..dc3d4c8 100644
          updatePrivacyGuardOption();
      }
  
-@@ -184,15 +162,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
+@@ -186,15 +164,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
          return R.drawable.ic_features;
      }
  
@@ -183,5 +183,5 @@ index 1a9318d..e362841 100644
      public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
      public static final String KEY_PRIVACY_GUARD = "privacy_guard_default";
 -- 
-2.18.0
+2.31.1
 

Patches/LineageOS-15.1/android_packages_apps_Updater/0001-Server.patch

@@ -0,0 +1,36 @@
+From 03e04247e9416a901fbb30b742d985ac6c801598 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Thu, 20 Sep 2018 16:43:46 -0400
+Subject: [PATCH] Switch to our update server
+
+Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
+---
+ src/org/lineageos/updater/misc/Utils.java | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
+index 171c2cc..d97a492 100644
+--- a/src/org/lineageos/updater/misc/Utils.java
++++ b/src/org/lineageos/updater/misc/Utils.java
+@@ -149,16 +149,10 @@ public class Utils {
+         String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
+         String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
+                 SystemProperties.get(Constants.PROP_DEVICE));
+-        String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT);
+ 
+-        String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
+-        if (serverUrl.trim().isEmpty()) {
+-            serverUrl = context.getString(R.string.updater_server_url);
+-        }
++        String server = "0OTA_SERVER_CLEARNET0";
+ 
+-        return serverUrl.replace("{device}", device)
+-                .replace("{type}", type)
+-                .replace("{incr}", incrementalVersion);
++        return server + "?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
+     }
+ 
+     public static String getChangelogURL(Context context) {
+-- 
+2.19.0
+

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

@@ -1,4 +1,4 @@
-From 315dba9fbc687da50f6217ff3db20bb14c11a1a4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Thu, 20 Sep 2018 21:44:53 -0400
 Subject: [PATCH] Add support for routing over Tor
@@ -36,7 +36,7 @@ index e30c117..f5f3170 100644
          android:id="@+id/preferences_auto_delete_updates"
          android:layout_width="match_parent"
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index b3ce44e..48d8a81 100644
+index d8b0fd9..5eca45d 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
 @@ -68,6 +68,7 @@
@@ -292,7 +292,7 @@ index 81e7c1a..46d8666 100644
      public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
      public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
 diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
-index 65d6ec7..06838ef 100644
+index e9c2f17..c7eadd1 100644
 --- a/src/org/lineageos/updater/misc/Utils.java
 +++ b/src/org/lineageos/updater/misc/Utils.java
 @@ -45,6 +45,7 @@ import java.io.BufferedReader;
@@ -381,5 +381,5 @@ index 65d6ec7..06838ef 100644
          return server + "?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
      }
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch

@@ -1,4 +1,4 @@
-From 3f038f4a5e81a78f286f5557066af271683fadbc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Luca Stefani <luca.stefani.ge1@gmail.com>
 Date: Thu, 24 Nov 2016 13:31:24 +0100
 Subject: [PATCH] MediaProvider: Add read storage permission
@@ -12,7 +12,7 @@ Change-Id: Id4dd5e287c1162f4c8b7fbb2411b834fe98f2516
  1 file changed, 1 insertion(+)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 05e6d77..2e33a3a 100644
+index 05e6d77d..2e33a3a4 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
 @@ -13,6 +13,7 @@
@@ -24,5 +24,5 @@ index 05e6d77..2e33a3a 100644
      <application android:process="android.process.media"
                   android:label="@string/app_label"
 -- 
-2.30.2
+2.31.1
 

Patches/LineageOS-15.1/android_packages_services_Telephony/0001-PREREQ_Handle_All_Modes.patch

@@ -1,4 +1,4 @@
-From 0b47472891efb2b151e8a02783193846dc48be3e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Fri, 28 Dec 2018 21:18:47 -0500
 Subject: [PATCH] Change UpdateEnabledNetworksValueAndSummary to handle all
@@ -137,5 +137,5 @@ index 0ea4702b4..4bf0f9e9a 100644
  
          @Override
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-15.1/android_packages_services_Telephony/0002-More_Preferred_Network_Modes.patch

@@ -1,4 +1,4 @@
-From 44e79643f7eae9b659473a8ed2d13ffb7e5259ba Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Fri, 28 Dec 2018 21:22:20 -0500
 Subject: [PATCH] More preferred network modes
@@ -258,5 +258,5 @@ index 4bf0f9e9a..bef36528e 100644
                          mButtonEnabledNetworks.setSummary(R.string.network_global);
                      }
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-15.1/android_system_core/0001-Harden.patch

@@ -1,13 +1,13 @@
-From 0ccf36d7c3f43254216fdcdd15c6247403e3ef53 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Mon, 12 Feb 2018 03:29:58 -0500
 Subject: [PATCH] Harden
 
 Change-Id: Idd2da6d9989ec554ce5b0841781d323fdcd9eb87
 ---
- init/init.cpp   | 6 +++---
+ init/init.cpp   |  6 +++---
- rootdir/init.rc | 9 +++++++++
+ rootdir/init.rc | 11 +++++++++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
+ 2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/init/init.cpp b/init/init.cpp
 index 35fc442d0..b65686f93 100644
@@ -31,6 +31,8 @@ index 35fc442d0..b65686f93 100644
          mount("selinuxfs", "/sys/fs/selinux", "selinuxfs", 0, NULL);
          mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11));
          mknod("/dev/random", S_IFCHR | 0666, makedev(1, 8));
+diff --git a/rootdir/init.rc b/rootdir/init.rc
+index f9cb4a3ef..7d618af63 100644
 --- a/rootdir/init.rc
 +++ b/rootdir/init.rc
 @@ -124,6 +124,17 @@ on init
@@ -52,5 +54,5 @@ index 35fc442d0..b65686f93 100644
      write /proc/sys/vm/mmap_min_addr 32768
      write /proc/sys/net/ipv4/ping_group_range "0 2147483647"
 -- 
-2.21.0
+2.31.1
 

Patches/LineageOS-15.1/android_system_vold/0001-AES256.patch

@@ -1,4 +1,4 @@
-From 1a5bbf0ee895bbd66fb3ce66be44b1074bb20324 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 28 Feb 2018 08:21:28 -0500
 Subject: [PATCH] Build time variable for AES-256 encryption
@@ -10,7 +10,7 @@ Change-Id: I25eba5939c965323e4ffa6d95c6736b671c51e09
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/Android.mk b/Android.mk
-index 14bf99a..0e9f3e1 100644
+index 2beae28..25fd823 100644
 --- a/Android.mk
 +++ b/Android.mk
 @@ -115,6 +115,10 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
@@ -25,7 +25,7 @@ index 14bf99a..0e9f3e1 100644
    vold_cflags += -DCONFIG_EXFAT_DRIVER=\"$(TARGET_EXFAT_DRIVER)\"
    mini_src_files += fs/Exfat.cpp
 diff --git a/cryptfs.cpp b/cryptfs.cpp
-index f01929a..7fb3ffa 100644
+index e33afdd..5102f12 100644
 --- a/cryptfs.cpp
 +++ b/cryptfs.cpp
 @@ -75,9 +75,17 @@ extern "C" {
@@ -55,5 +55,5 @@ index f01929a..7fb3ffa 100644
  #define RSA_EXPONENT 0x10001
  #define KEYMASTER_CRYPTFS_RATE_LIMIT 1  // Maximum one try per second
 -- 
-2.16.2
+2.31.1
 

Patches/LineageOS-16.0/android_bionic/0001-HM-Use_HM.patch

@@ -1,4 +1,4 @@
-From a0f883810d372c01632846d9bb3bd90807498fba Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 5 Dec 2018 01:51:56 -0500
 Subject: [PATCH] add hardened_malloc library
@@ -9,7 +9,7 @@ Subject: [PATCH] add hardened_malloc library
  2 files changed, 40 insertions(+), 9 deletions(-)
 
 diff --git a/libc/Android.bp b/libc/Android.bp
-index 6ba7cce9b..26ffc73b6 100644
+index eeeadb672..5b3495ff2 100644
 --- a/libc/Android.bp
 +++ b/libc/Android.bp
 @@ -51,6 +51,8 @@ libc_common_flags = [
@@ -40,7 +40,7 @@ index 6ba7cce9b..26ffc73b6 100644
      stl: "none",
      system_shared_libs: [],
      sanitize: {
-@@ -1577,11 +1587,6 @@ cc_library_static {
+@@ -1609,11 +1619,6 @@ cc_library_static {
      name: "libc_ndk",
      defaults: ["libc_defaults"],
      srcs: libc_common_src_files + ["bionic/malloc_common.cpp"],
@@ -52,7 +52,7 @@ index 6ba7cce9b..26ffc73b6 100644
      arch: {
          arm: {
              srcs: [
-@@ -1613,9 +1618,18 @@ cc_library_static {
+@@ -1645,9 +1650,18 @@ cc_library_static {
          "libc_syscalls",
          "libc_tzcode",
          "libm",
@@ -72,7 +72,7 @@ index 6ba7cce9b..26ffc73b6 100644
  }
  
  // ========================================================
-@@ -1705,7 +1719,11 @@ cc_library_static {
+@@ -1737,7 +1751,11 @@ cc_library_static {
  // ========================================================
  cc_library_static {
      defaults: ["libc_defaults"],
@@ -85,7 +85,7 @@ index 6ba7cce9b..26ffc73b6 100644
      cflags: ["-fvisibility=hidden"],
  
      name: "libc_malloc",
-@@ -1768,9 +1786,17 @@ cc_library {
+@@ -1800,9 +1818,17 @@ cc_library {
      ],
      whole_static_libs: [
          "libc_common",
@@ -122,3 +122,6 @@ index 1ea4ac1a3..c86fbdaea 100644
  
  static constexpr MallocDispatch __libc_malloc_default_dispatch
    __attribute__((unused)) = {
+-- 
+2.31.1
+

Patches/LineageOS-16.0/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch

@@ -1,4 +1,4 @@
-From 1b25d8a9ffb75767419cc0ab80569f44155bb166 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 19 Aug 2020 09:31:04 -0400
 Subject: [PATCH] reject updates with serialno constraints
@@ -38,5 +38,5 @@ index db5792b8..25df53a3 100644
  
    if (metadata["ota-type"] != "AB") {
 -- 
-2.26.2
+2.31.1
 

Patches/LineageOS-16.0/android_bootable_recovery/0002-Remove_Logo.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Tue, 24 Apr 2018 12:13:43 -0400
+Subject: [PATCH] Remove logo
+
+Change-Id: Ibf900e6ceb8a571b4770f6df7efeea1d97b6b477
+---
+ screen_ui.cpp | 8 --------
+ screen_ui.h   | 1 -
+ 2 files changed, 9 deletions(-)
+
+diff --git a/screen_ui.cpp b/screen_ui.cpp
+index 56fa314f..adc6d2b8 100644
+--- a/screen_ui.cpp
++++ b/screen_ui.cpp
+@@ -581,13 +581,6 @@ void ScreenRecoveryUI::draw_header_locked(int& y) {
+   }
+   y += v_unit;
+ 
+-  // Draw logo
+-  icon = logo_image;
+-  icon_w = gr_get_width(icon);
+-  icon_h = gr_get_height(icon);
+-  icon_x = kMarginWidth + (gr_fb_width() - icon_w) / 2;
+-  icon_y = y + ((v_unit * 4) - icon_h) / 2;
+-  gr_blit(icon, 0, 0, icon_w, icon_h, icon_x, icon_y);
+   y += v_unit * 4;
+ 
+   y += v_unit * 1;  // Margin
+@@ -906,7 +899,6 @@ bool ScreenRecoveryUI::Init(const std::string& locale) {
+   // Set up the locale info.
+   SetLocale(locale);
+ 
+-  LoadBitmap("logo_image", &logo_image);
+   LoadBitmap("ic_back", &ic_back);
+   LoadBitmap("ic_back_sel", &ic_back_sel);
+ 
+diff --git a/screen_ui.h b/screen_ui.h
+index ea1f5c03..6fa29b39 100644
+--- a/screen_ui.h
++++ b/screen_ui.h
+@@ -207,7 +207,6 @@ class ScreenRecoveryUI : public RecoveryUI {
+   // The layout to use.
+   int layout_;
+ 
+-  GRSurface* logo_image;
+   GRSurface* ic_back;
+   GRSurface* ic_back_sel;
+ 
+-- 
+2.31.1
+

Patches/LineageOS-16.0/android_build/0001-OTA_Keys.patch

@@ -1,4 +1,4 @@
-From d77b1a23b87813edb3133d314760249e1873cdf8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 5 Apr 2021 23:00:41 -0400
 Subject: [PATCH] Allow setting OTA public keys from environment variable
@@ -10,7 +10,7 @@ Change-Id: Id2338b2d30f7c477583a34f4171d37b70f0a6e92
  2 files changed, 9 insertions(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index 404bb5413..bd23c8be3 100644
+index 404bb54133..bd23c8be3d 100644
 --- a/core/Makefile
 +++ b/core/Makefile
 @@ -1413,6 +1413,10 @@ endif
@@ -25,7 +25,7 @@ index 404bb5413..bd23c8be3 100644
  # recovery binary.
  RECOVERY_INSTALL_OTA_KEYS := \
 diff --git a/core/product_config.mk b/core/product_config.mk
-index 2c3f21f1d..a300efbcf 100644
+index 2c3f21f1db..a300efbcf5 100644
 --- a/core/product_config.mk
 +++ b/core/product_config.mk
 @@ -399,6 +399,11 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \
@@ -41,5 +41,5 @@ index 2c3f21f1d..a300efbcf 100644
      $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER))
  PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := \
 -- 
-2.30.2
+2.31.1
 

Patches/LineageOS-16.0/android_build/0002-Enable_fwrapv.patch

@@ -1,4 +1,4 @@
-From 5f919d5c9d9e7605b82841ffdcf5d1a16a1613fa Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Tue, 13 Sep 2016 22:05:56 -0400
 Subject: [PATCH] use -fwrapv when signed overflow checking is off
@@ -21,3 +21,6 @@ index d570ccda8e..b200572d32 100644
 +    my_cflags += -fwrapv
 +  endif
 +endif
+-- 
+2.31.1
+

Patches/LineageOS-16.0/android_build_soong/0001-Enable_fwrapv.patch

@@ -1,4 +1,4 @@
-From adec149524637ba191e0db27d9b729b4cd53cd9e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 23 Aug 2017 20:28:03 -0400
 Subject: [PATCH] use -fwrapv when signed overflow checking is off
@@ -51,3 +51,6 @@ index de970352e..17c11f8b1 100644
  	if Bool(sanitize.Properties.Sanitize.Diag.Undefined) {
  		diagSanitizers = append(diagSanitizers, "undefined")
  	}
+-- 
+2.31.1
+

Patches/LineageOS-16.0/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch

@@ -1,4 +1,4 @@
-From 41c2cb884b69e04e2e7a6404b580aafc4b2ceba7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 12 Feb 2018 02:41:09 -0500
 Subject: [PATCH] TEMPORARY fix camera not working on user builds
@@ -9,7 +9,7 @@ Change-Id: I61e8c78bfd70be7c157c049dac201de21749d4a2
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/common/mediaserver.te b/common/mediaserver.te
-index 1108551..6b92565 100755
+index ed7babb..9c1f086 100755
 --- a/common/mediaserver.te
 +++ b/common/mediaserver.te
 @@ -13,12 +13,10 @@ binder_call(mediaserver, rild)
@@ -30,5 +30,5 @@ index 1108551..6b92565 100755
  r_dir_file(mediaserver, sysfs_esoc)
  #allow mediaserver system_app_data_file:file rw_file_perms;
 -- 
-2.16.1
+2.31.1
 

Patches/LineageOS-16.0/android_frameworks_base/0006-Disable_Analytics.patch

@@ -1,4 +1,4 @@
-From 5b59a2cf8028488847a5cd6ac7d4a14414972438 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 21 May 2018 04:23:40 -0400
 Subject: [PATCH] Disable/reduce functionality of various ad/analytics
@@ -6,14 +6,14 @@ Subject: [PATCH] Disable/reduce functionality of various ad/analytics
 
 Change-Id: I84303ee26d0232e471f44ae6eff6e41a2210e42e
 ---
- core/java/android/content/pm/PackageParser.java | 12 ++++++++++++
+ core/java/android/content/pm/PackageParser.java | 14 ++++++++++++++
- 1 file changed, 12 insertions(+)
+ 1 file changed, 14 insertions(+)
 
 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index 8c66fb227cf..31368bf74b1 100644
+index e0c2d2dc6dde..85a669a4a6c1 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
-@@ -5524,6 +5524,20 @@ public class PackageParser {
+@@ -5327,6 +5327,20 @@ public class PackageParser {
  
          if (data == null) {
              data = new Bundle();
@@ -35,5 +35,5 @@ index 8c66fb227cf..31368bf74b1 100644
  
          String name = sa.getNonConfigurationString(
 -- 
-2.17.0
+2.31.1
 

Patches/LineageOS-16.0/android_frameworks_base/0007-Always_Restict_Serial.patch

@@ -1,4 +1,4 @@
-From 138790c0a2eba54f7ebb4c3b8fd5efac32559fea Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 6 Sep 2017 21:40:48 -0400
 Subject: [PATCH] always set deprecated Build.SERIAL to UNKNOWN
@@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index a1d42c09133..b5b3c68d563 100644
+index 8f1692a24d27..fd4703094780 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -7762,13 +7762,7 @@ private final boolean attachApplicationLocked(IApplicationThread thread,
+@@ -7886,13 +7886,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                  }
              }
  
@@ -28,3 +28,6 @@ index a1d42c09133..b5b3c68d563 100644
  
              // Check if this is a secondary process that should be incorporated into some
              // currently active instrumentation.  (Note we do this AFTER all of the profiling
+-- 
+2.31.1
+

Patches/LineageOS-16.0/android_frameworks_native/0001-Sensors.patch

@@ -1,4 +1,4 @@
-From 292631a7e653549c02a6c29aa98cba8db770a21b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Fri, 15 Mar 2019 22:14:54 +0100
 Subject: [PATCH] AppOps/PrivacyGuard: New Sensor checks [native]
@@ -22,7 +22,7 @@ diff --git a/libs/binder/include/binder/AppOpsManager.h b/libs/binder/include/bi
 index fb682ecde7..83887787c9 100644
 --- a/libs/binder/include/binder/AppOpsManager.h
 +++ b/libs/binder/include/binder/AppOpsManager.h
-@@ -119,7 +119,9 @@ class AppOpsManager
+@@ -119,7 +119,9 @@ public:
          OP_BOOT_COMPLETED = 79,
          OP_NFC_CHANGE = 80,
          OP_DATA_CONNECT_CHANGE = 81,
@@ -34,7 +34,7 @@ index fb682ecde7..83887787c9 100644
  
      AppOpsManager();
 diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
-index a0e368c7e4..03fee85bf8 100644
+index 2383516c95..835794b1bd 100644
 --- a/libs/sensor/Sensor.cpp
 +++ b/libs/sensor/Sensor.cpp
 @@ -52,6 +52,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi
@@ -154,3 +154,6 @@ index 1c3e943543..142c5a274e 100644
      return true;
  }
  
+-- 
+2.31.1
+

Patches/LineageOS-16.0/android_packages_apps_Backgrounds/308977.patch

@@ -1,4 +1,4 @@
-From 32ebb8bb7abd2fc6031a68d9eec70d83e218b79d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: DJAB HipHop <mweb71@yahoo.com>
 Date: Wed, 26 May 2021 20:19:17 +0200
 Subject: [PATCH] Backgrounds: Optimize builtin wallpaper loading code
@@ -15,7 +15,7 @@ diff --git a/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpape
 index 7508d3c..264fa6b 100644
 --- a/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpaperFactory.java
 +++ b/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpaperFactory.java
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ package org.lineageos.backgrounds.factory;
  import android.app.WallpaperManager;
  import android.content.res.Resources;
  import android.graphics.drawable.Drawable;
@@ -23,7 +23,7 @@ index 7508d3c..264fa6b 100644
  
  import androidx.annotation.DrawableRes;
  import androidx.annotation.NonNull;
-@@ -25,6 +26,7 @@
+@@ -25,6 +26,7 @@ import androidx.annotation.NonNull;
  import org.lineageos.backgrounds.R;
  import org.lineageos.backgrounds.bundle.WallpaperBundle;
  import org.lineageos.backgrounds.bundle.WallpaperType;
@@ -31,7 +31,7 @@ index 7508d3c..264fa6b 100644
  
  public final class BuiltInWallpaperFactory {
  
-@@ -33,8 +35,9 @@ private BuiltInWallpaperFactory() {
+@@ -33,8 +35,9 @@ public final class BuiltInWallpaperFactory {
  
      public static WallpaperBundle build(@NonNull final String name,
                                          @NonNull final Resources res,
@@ -47,7 +47,7 @@ diff --git a/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java b/app
 index 2d5b798..b0de83b 100644
 --- a/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java
 +++ b/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java
-@@ -17,6 +17,9 @@
+@@ -17,6 +17,9 @@ package org.lineageos.backgrounds.util;
  
  import android.view.View;
  import android.view.Window;
@@ -57,7 +57,7 @@ index 2d5b798..b0de83b 100644
  
  import androidx.annotation.ColorInt;
  import androidx.annotation.NonNull;
-@@ -38,4 +41,41 @@ public static void setStatusBarColor(@NonNull final Window window, @ColorInt fin
+@@ -38,4 +41,41 @@ public final class UiUtils {
  
          window.getDecorView().setSystemUiVisibility(flags);
      }
@@ -99,3 +99,6 @@ index 2d5b798..b0de83b 100644
 +        return BitmapFactory.decodeResource(res, resId, options);
 +    }
  }
+-- 
+2.31.1
+

Patches/LineageOS-16.0/android_packages_apps_Dialer/0001-Not_Private_Banner.patch

@@ -1,4 +1,4 @@
-From 600951935f6c2f9a7343c01efdff827546126157 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Torsten Grote <t@grobox.de>
 Date: Thu, 18 Jun 2020 13:15:16 -0300
 Subject: [PATCH] Show privacy warning on in-call screen

Patches/LineageOS-16.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch

@@ -1,4 +1,4 @@
-From 8ba726b35be8f00da453c514c57c33a75a8f2984 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Thu, 19 Apr 2018 20:46:02 -0400
 Subject: [PATCH] Remove analytics
@@ -14,10 +14,10 @@ Change-Id: Idcc15bfeda4805b305423534663429942abd1bcf
  6 files changed, 59 deletions(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index dba419a..af4765f 100644
+index b8129ad..b16e09f 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
-@@ -226,31 +226,6 @@
+@@ -208,31 +208,6 @@
                  android:resource="@string/expanded_desktop_settings_summary" />
          </activity-alias>
  
@@ -76,10 +76,10 @@ index 4236b27..eed044a 100644
      <bool name="config_showWeatherMenu">true</bool>
  
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 684cbee..b60e87e 100644
+index 6ea63bf..7f4c39c 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -536,28 +536,6 @@
+@@ -541,28 +541,6 @@
                   <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                   <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
  
@@ -139,5 +139,5 @@ index 6833cfe..d06175e 100644
              android:key="sms_security_check_limit"
              android:defaultValue="30"
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-16.0/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch

@@ -1,4 +1,4 @@
-From 691104a3ab5f51328008ce579465859fea2a4a2c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Mon, 10 Sep 2018 12:05:40 +0200
 Subject: [PATCH] Network & Internet Settings: Add option to switch off Captive
@@ -26,7 +26,7 @@ Change-Id: Ibbffdb5f3930df74ca8b4ba93d451f7fad086989
  create mode 100644 src/com/android/settings/network/CaptivePortalWarningDialogHost.java
 
 diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
-index 53dca0e6e7..6389546594 100644
+index 53dca0e6e7..dee07db2b4 100644
 --- a/res/values-de/cm_strings.xml
 +++ b/res/values-de/cm_strings.xml
 @@ -308,4 +308,7 @@
@@ -38,7 +38,7 @@ index 53dca0e6e7..6389546594 100644
 +    <string name="captive_portal_switch_warning">Nach dem Ausschalten der Captive-Portal-Erkennung empfangen Sie keine Verbindungs-Rückmeldung mehr. Wirklich fortfahren?</string>
  </resources>
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index 7d0b80d3c0..0a67cbe8ad 100644
+index 7d0b80d3c0..c4a0aaa915 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
 @@ -398,4 +398,9 @@
@@ -66,6 +66,8 @@ index 6eda0b0966..899bc41dd2 100644
 +        android:order="20"/>
 +
  </PreferenceScreen>
+diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
+index 4bdd8e1dba..2c9f04ca3e 100644
 --- a/src/com/android/settings/ResetNetworkConfirm.java
 +++ b/src/com/android/settings/ResetNetworkConfirm.java
 @@ -32,6 +32,7 @@ import android.os.Bundle;
@@ -88,6 +90,8 @@ index 6eda0b0966..899bc41dd2 100644
              // There has been issues when Sms raw table somehow stores orphan
              // fragments. They lead to garbled message when new fragments come
 diff --git a/src/com/android/settings/network/CaptivePortalModePreferenceController.java b/src/com/android/settings/network/CaptivePortalModePreferenceController.java
+new file mode 100644
+index 0000000000..0fd2d094a1
 --- /dev/null
 +++ b/src/com/android/settings/network/CaptivePortalModePreferenceController.java
 @@ -0,0 +1,81 @@
@@ -173,6 +177,8 @@ diff --git a/src/com/android/settings/network/CaptivePortalModePreferenceControl
 +    }
 +}
 diff --git a/src/com/android/settings/network/CaptivePortalWarningDialog.java b/src/com/android/settings/network/CaptivePortalWarningDialog.java
+new file mode 100644
+index 0000000000..8240c2756e
 --- /dev/null
 +++ b/src/com/android/settings/network/CaptivePortalWarningDialog.java
 @@ -0,0 +1,73 @@
@@ -250,6 +256,8 @@ diff --git a/src/com/android/settings/network/CaptivePortalWarningDialog.java b/
 +    }
 +}
 diff --git a/src/com/android/settings/network/CaptivePortalWarningDialogHost.java b/src/com/android/settings/network/CaptivePortalWarningDialogHost.java
+new file mode 100644
+index 0000000000..7a04d1f831
 --- /dev/null
 +++ b/src/com/android/settings/network/CaptivePortalWarningDialogHost.java
 @@ -0,0 +1,32 @@
@@ -285,6 +293,8 @@ diff --git a/src/com/android/settings/network/CaptivePortalWarningDialogHost.jav
 +     */
 +    void onCaptivePortalSwitchOffDialogDismissed();
 +}
+diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
+index 89bf5f4dec..4af55e2b50 100644
 --- a/src/com/android/settings/network/NetworkDashboardFragment.java
 +++ b/src/com/android/settings/network/NetworkDashboardFragment.java
 @@ -44,7 +44,7 @@ import java.util.Arrays;

Patches/LineageOS-16.0/android_packages_apps_Settings/0002-Sensors-P1.patch

@@ -1,7 +1,7 @@
-From 72b86ddf9fe37cf2fb45266edf53446eb34a86df Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Fri, 15 Mar 2019 22:29:43 +0100
-Subject: [PATCH 1/2] AppOps/PrivacyGuard: New Sensor checks [Settings]
+Subject: [PATCH] AppOps/PrivacyGuard: New Sensor checks [Settings]
 
 Add two AppOps for sensor access:
 - OP_MOTION_SENSORS (default: ask, strict)
@@ -19,7 +19,7 @@ Change-Id: I9b51c47e27a330823ecb4472b9a7818718ef4209
  5 files changed, 34 insertions(+), 3 deletions(-)
 
 diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
-index 53dca0e6e7..740ecdb8ee 100644
+index dee07db2b4..02cafb1b05 100644
 --- a/res/values-de/cm_strings.xml
 +++ b/res/values-de/cm_strings.xml
 @@ -39,6 +39,7 @@
@@ -87,7 +87,7 @@ index 523d87d673..3133e8d4bf 100644
      <string name="app_ops_labels_picture_in_picture">Utiliser le mode Picture-in-Picture</string>
      <string name="app_ops_labels_play_audio">Lecture audio</string>
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index 7d0b80d3c0..83abcf8580 100644
+index c4a0aaa915..1150011970 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
 @@ -50,6 +50,7 @@

Patches/LineageOS-16.0/android_packages_apps_Settings/0002-Sensors-P2.patch

@@ -1,8 +1,7 @@
-From e25aed77e6309bfd63a6fde119cf4e2dd22612b3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MSe1969 <mse1969@posteo.de>
 Date: Tue, 19 Mar 2019 22:35:38 +0100
-Subject: [PATCH 2/2] AppOps details: Add permission icons for new Sensor
+Subject: [PATCH] AppOps details: Add permission icons for new Sensor AppOps
- AppOps
 
 Change-Id: Ifc337517818dcc929a406ed455fb76e6533507ab
 ---

Patches/LineageOS-16.0/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch

@@ -1,4 +1,4 @@
-From 9b423969aab33875fbddf194dde0162f7bebbdc8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Wed, 28 Feb 2018 08:12:03 -0500
 Subject: [PATCH] Remove analytics
@@ -183,5 +183,5 @@ index 1a9318d..e362841 100644
      public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
      public static final String KEY_PRIVACY_GUARD = "privacy_guard_default";
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-16.0/android_packages_apps_Updater/0001-Server.patch

@@ -0,0 +1,36 @@
+From 03e04247e9416a901fbb30b742d985ac6c801598 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Thu, 20 Sep 2018 16:43:46 -0400
+Subject: [PATCH] Switch to our update server
+
+Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
+---
+ src/org/lineageos/updater/misc/Utils.java | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
+index 171c2cc..d97a492 100644
+--- a/src/org/lineageos/updater/misc/Utils.java
++++ b/src/org/lineageos/updater/misc/Utils.java
+@@ -149,16 +149,10 @@ public class Utils {
+         String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
+         String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
+                 SystemProperties.get(Constants.PROP_DEVICE));
+-        String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT);
+ 
+-        String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
+-        if (serverUrl.trim().isEmpty()) {
+-            serverUrl = context.getString(R.string.updater_server_url);
+-        }
++        String server = "0OTA_SERVER_CLEARNET0";
+ 
+-        return serverUrl.replace("{device}", device)
+-                .replace("{type}", type)
+-                .replace("{incr}", incrementalVersion);
++        return server + "?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
+     }
+ 
+     public static String getChangelogURL(Context context) {
+-- 
+2.19.0
+

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

@@ -1,4 +1,4 @@
-From 315dba9fbc687da50f6217ff3db20bb14c11a1a4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Thu, 20 Sep 2018 21:44:53 -0400
 Subject: [PATCH] Add support for routing over Tor
@@ -36,10 +36,10 @@ index e30c117..f5f3170 100644
          android:id="@+id/preferences_auto_delete_updates"
          android:layout_width="match_parent"
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index b3ce44e..48d8a81 100644
+index 34f2fd3..e2a3e09 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -68,6 +68,7 @@
+@@ -70,6 +70,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>
@@ -47,7 +47,7 @@ index b3ce44e..48d8a81 100644
      <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>
-@@ -83,6 +84,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>
@@ -292,7 +292,7 @@ index 81e7c1a..46d8666 100644
      public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
      public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
 diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
-index 65d6ec7..06838ef 100644
+index f7f62e4..95b9acc 100644
 --- a/src/org/lineageos/updater/misc/Utils.java
 +++ b/src/org/lineageos/updater/misc/Utils.java
 @@ -45,6 +45,7 @@ import java.io.BufferedReader;
@@ -303,7 +303,7 @@ index 65d6ec7..06838ef 100644
  import java.util.ArrayList;
  import java.util.Enumeration;
  import java.util.HashSet;
-@@ -146,12 +147,76 @@ public class Utils {
+@@ -150,12 +151,76 @@ public class Utils {
          return updates;
      }
  
@@ -381,5 +381,5 @@ index 65d6ec7..06838ef 100644
          return server + "?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
      }
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-16.0/android_packages_services_Telephony/0001-PREREQ_Handle_All_Modes.patch

@@ -1,4 +1,4 @@
-From 0b47472891efb2b151e8a02783193846dc48be3e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Fri, 28 Dec 2018 21:18:47 -0500
 Subject: [PATCH] Change UpdateEnabledNetworksValueAndSummary to handle all
@@ -10,10 +10,10 @@ Change-Id: I92fe694627a90b619be21466da0b49cff39826c8
  1 file changed, 11 insertions(+), 39 deletions(-)
 
 diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
-index 0ea4702b4..4bf0f9e9a 100644
+index f128f9a98..36b65e77c 100644
 --- a/src/com/android/phone/MobileNetworkSettings.java
 +++ b/src/com/android/phone/MobileNetworkSettings.java
-@@ -1423,35 +1423,31 @@ public class MobileNetworkSettings extends Activity  {
+@@ -1608,35 +1608,31 @@ public class MobileNetworkSettings extends Activity  {
          }
  
          private void UpdateEnabledNetworksValueAndSummary(int NetworkMode) {
@@ -55,7 +55,7 @@ index 0ea4702b4..4bf0f9e9a 100644
                          mButtonEnabledNetworks.setSummary(R.string.network_global);
                      }
                      break;
-@@ -1466,13 +1462,9 @@ public class MobileNetworkSettings extends Activity  {
+@@ -1651,13 +1647,9 @@ public class MobileNetworkSettings extends Activity  {
                  case Phone.NT_MODE_LTE_ONLY:
                  case Phone.NT_MODE_LTE_WCDMA:
                      if (!mIsGlobalCdma) {
@@ -69,7 +69,7 @@ index 0ea4702b4..4bf0f9e9a 100644
                          mButtonEnabledNetworks.setSummary(R.string.network_global);
                      }
                      break;
-@@ -1483,33 +1475,12 @@ public class MobileNetworkSettings extends Activity  {
+@@ -1668,33 +1660,12 @@ public class MobileNetworkSettings extends Activity  {
                          controlCdmaOptions(true);
                          controlGsmOptions(false);
                      } else {
@@ -103,7 +103,7 @@ index 0ea4702b4..4bf0f9e9a 100644
                  case Phone.NT_MODE_LTE_TDSCDMA_GSM:
                  case Phone.NT_MODE_LTE_TDSCDMA_GSM_WCDMA:
                  case Phone.NT_MODE_LTE_TDSCDMA:
-@@ -1517,16 +1488,12 @@ public class MobileNetworkSettings extends Activity  {
+@@ -1702,16 +1673,12 @@ public class MobileNetworkSettings extends Activity  {
                  case Phone.NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                  case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
                      if (isSupportTdscdma()) {
@@ -120,7 +120,7 @@ index 0ea4702b4..4bf0f9e9a 100644
                          if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
                                  mIsGlobalCdma ||
                                  isWorldMode()) {
-@@ -1538,10 +1505,15 @@ public class MobileNetworkSettings extends Activity  {
+@@ -1723,10 +1690,15 @@ public class MobileNetworkSettings extends Activity  {
                      }
                      break;
                  default:
@@ -137,5 +137,5 @@ index 0ea4702b4..4bf0f9e9a 100644
  
          @Override
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-16.0/android_packages_services_Telephony/0002-More_Preferred_Network_Modes.patch

@@ -1,4 +1,4 @@
-From 3433e3f518dc572fa65056276cec79eadd4fb2d2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Fri, 28 Dec 2018 21:22:20 -0500
 Subject: [PATCH] More preferred network modes
@@ -258,5 +258,5 @@ index 36b65e77c..968ec96bc 100644
                          mButtonEnabledNetworks.setSummary(R.string.network_global);
                      }
 -- 
-2.20.1
+2.31.1
 

Patches/LineageOS-16.0/android_system_core/0001-Harden.patch

@@ -1,13 +1,13 @@
-From 7ab11e320c3b3c3338c5b66a5303bcaa074395be Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Mon, 12 Feb 2018 03:29:58 -0500
 Subject: [PATCH] Harden
 
 Change-Id: Idd2da6d9989ec554ce5b0841781d323fdcd9eb87
 ---
- init/init.cpp   | 6 +++---
+ init/init.cpp   |  6 +++---
- rootdir/init.rc | 9 +++++++++
+ rootdir/init.rc | 11 +++++++++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
+ 2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/init/init.cpp b/init/init.cpp
 index eb9dd755b..504a6d13e 100644
@@ -31,6 +31,8 @@ index eb9dd755b..504a6d13e 100644
          mount("selinuxfs", "/sys/fs/selinux", "selinuxfs", 0, NULL);
  
          mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11));
+diff --git a/rootdir/init.rc b/rootdir/init.rc
+index 9ad628b4e..4ed148857 100644
 --- a/rootdir/init.rc
 +++ b/rootdir/init.rc
 @@ -121,6 +121,17 @@ on init
@@ -52,5 +54,5 @@ index eb9dd755b..504a6d13e 100644
      write /proc/sys/vm/mmap_min_addr 32768
      write /proc/sys/net/ipv4/ping_group_range "0 2147483647"
 -- 
-2.21.0
+2.31.1
 

Patches/LineageOS-16.0/android_system_extras/0001-ext4_pad_filenames.patch

@@ -1,4 +1,4 @@
-From d0715a364f5a6f366cbd3582b01d21a22a0a0ca2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 15 Dec 2016 17:22:41 -0500
 Subject: [PATCH] ext4_crypt: pad filenames to 32 bytes, not 16 or 4
@@ -10,10 +10,10 @@ by leaving them with the previous padding settings until factory reset.
  1 file changed, 21 insertions(+), 2 deletions(-)
 
 diff --git a/ext4_utils/ext4_crypt.cpp b/ext4_utils/ext4_crypt.cpp
-index 36fe11f7..c5d5fde2 100644
+index 95b67a1c..35bd1663 100644
 --- a/ext4_utils/ext4_crypt.cpp
 +++ b/ext4_utils/ext4_crypt.cpp
-@@ -133,7 +133,7 @@ static bool is_dir_empty(const char *dirname, bool *is_empty)
+@@ -135,7 +135,7 @@ static bool is_dir_empty(const char *dirname, bool *is_empty)
      return true;
  }
  
@@ -22,7 +22,7 @@ index 36fe11f7..c5d5fde2 100644
      if (filenames_encryption_mode == EXT4_ENCRYPTION_MODE_AES_256_CTS) {
          // Use legacy padding with our original filenames encryption mode.
          return EXT4_POLICY_FLAGS_PAD_4;
-@@ -145,6 +145,15 @@ static uint8_t e4crypt_get_policy_flags(int filenames_encryption_mode) {
+@@ -152,6 +152,15 @@ static uint8_t e4crypt_get_policy_flags(int filenames_encryption_mode) {
      return EXT4_POLICY_FLAGS_PAD_16;
  }
  
@@ -38,7 +38,7 @@ index 36fe11f7..c5d5fde2 100644
  static bool e4crypt_policy_set(const char *directory, const char *policy,
                                 size_t policy_length,
                                 int contents_encryption_mode,
-@@ -163,6 +172,14 @@ static bool e4crypt_policy_set(const char *directory, const char *policy,
+@@ -170,6 +179,14 @@ static bool e4crypt_policy_set(const char *directory, const char *policy,
      }
  
      ext4_encryption_policy eep;
@@ -53,7 +53,7 @@ index 36fe11f7..c5d5fde2 100644
      eep.version = 0;
      eep.contents_encryption_mode = contents_encryption_mode;
      eep.filenames_encryption_mode = filenames_encryption_mode;
-@@ -210,7 +227,9 @@ static bool e4crypt_policy_get(const char *directory, char *policy,
+@@ -217,7 +234,9 @@ static bool e4crypt_policy_get(const char *directory, char *policy,
              || (eep.contents_encryption_mode != contents_encryption_mode)
              || (eep.filenames_encryption_mode != filenames_encryption_mode)
              || (eep.flags !=
@@ -64,3 +64,6 @@ index 36fe11f7..c5d5fde2 100644
          LOG(ERROR) << "Failed to find matching encryption policy for " << directory;
          return false;
      }
+-- 
+2.31.1
+

Patches/LineageOS-17.1/android_bionic/0001-HM-Use_HM.patch

@@ -1,4 +1,4 @@
-From 010949662f6579419dd310606bf1418dbd53a971 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 5 Dec 2018 01:51:56 -0500
 Subject: [PATCH] add hardened_malloc library
@@ -11,10 +11,10 @@ Subject: [PATCH] add hardened_malloc library
  create mode 100644 libc/bionic/h_malloc_wrapper.cpp
 
 diff --git a/libc/Android.bp b/libc/Android.bp
-index 47fccde7e..7c3f57fba 100644
+index 6031b1661..e7ca82f92 100644
 --- a/libc/Android.bp
 +++ b/libc/Android.bp
-@@ -52,6 +52,8 @@ libc_common_flags = [
+@@ -53,6 +53,8 @@ libc_common_flags = [
      // Clang's exit-time destructor registration hides __dso_handle, but
      // __dso_handle needs to have default visibility on ARM32. See b/73485611.
      "-Wexit-time-destructors",
@@ -23,7 +23,7 @@ index 47fccde7e..7c3f57fba 100644
  ]
  
  // Define some common cflags
-@@ -65,9 +67,17 @@ cc_defaults {
+@@ -66,9 +68,17 @@ cc_defaults {
      cppflags: [],
      include_dirs: [
          "bionic/libc/async_safe/include",
@@ -42,7 +42,7 @@ index 47fccde7e..7c3f57fba 100644
      stl: "none",
      system_shared_libs: [],
      sanitize: {
-@@ -92,7 +102,6 @@ cc_defaults {
+@@ -93,7 +103,6 @@ cc_defaults {
  // TLS slot.
  
  cc_library_static {
@@ -50,7 +50,7 @@ index 47fccde7e..7c3f57fba 100644
      srcs: [
          "bionic/__libc_init_main_thread.cpp",
          "bionic/__stack_chk_fail.cpp",
-@@ -1309,6 +1318,10 @@ cc_library_static {
+@@ -1307,6 +1316,10 @@ cc_library_static {
      multilib: {
          lib32: {
              srcs: libc_common_src_files_32,
@@ -61,7 +61,7 @@ index 47fccde7e..7c3f57fba 100644
          },
      },
      arch: {
-@@ -1342,7 +1355,6 @@ cc_library_static {
+@@ -1340,7 +1353,6 @@ cc_library_static {
          "libc_syscalls",
          "libc_tzcode",
          "libm",
@@ -69,7 +69,7 @@ index 47fccde7e..7c3f57fba 100644
          "libstdc++",
      ],
  }
-@@ -1480,7 +1492,14 @@ cc_library_static {
+@@ -1478,7 +1490,14 @@ cc_library_static {
  // ========================================================
  cc_library_static {
      defaults: ["libc_defaults"],
@@ -85,7 +85,7 @@ index 47fccde7e..7c3f57fba 100644
      cflags: ["-fvisibility=hidden"],
  
      name: "libc_malloc",
-@@ -1578,9 +1597,14 @@ cc_library {
+@@ -1576,9 +1595,14 @@ cc_library {
      static_libs: [
          "libdl_android",
      ],
@@ -179,3 +179,6 @@ index 2176e634d..e2c1910d2 100644
  
  #endif
  
+-- 
+2.31.1
+

Patches/LineageOS-17.1/android_bionic/0002-Symbol_Ordering.patch

@@ -1,4 +1,4 @@
-From ede5e38f5b11f362c393e35911d5440db27c402a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sat, 7 Sep 2019 19:27:52 -0400
 Subject: [PATCH] disable symbol ordering for now
@@ -8,10 +8,10 @@ Subject: [PATCH] disable symbol ordering for now
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libc/Android.bp b/libc/Android.bp
-index 7c3f57fba..5352f39cb 100644
+index e7ca82f92..6c753091b 100644
 --- a/libc/Android.bp
 +++ b/libc/Android.bp
-@@ -1645,7 +1645,7 @@ cc_library {
+@@ -1643,7 +1643,7 @@ cc_library {
          versions: ["10000"],
      },
  
@@ -20,3 +20,6 @@ index 7c3f57fba..5352f39cb 100644
  }
  
  genrule {
+-- 
+2.31.1
+

Patches/LineageOS-17.1/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch

@@ -1,4 +1,4 @@
-From 9412877c6f5303f9e658144e99eadde604dafbd0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 19 Aug 2020 09:31:04 -0400
 Subject: [PATCH] reject updates with serialno constraints
@@ -8,10 +8,10 @@ Subject: [PATCH] reject updates with serialno constraints
  1 file changed, 2 insertions(+), 14 deletions(-)
 
 diff --git a/install/install.cpp b/install/install.cpp
-index 9203ef0e..308aca49 100644
+index 762c4572..6dd26123 100644
 --- a/install/install.cpp
 +++ b/install/install.cpp
-@@ -205,22 +205,10 @@ int CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ota
+@@ -204,22 +204,10 @@ int CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ota
      return INSTALL_ERROR;
    }
  
@@ -36,3 +36,6 @@ index 9203ef0e..308aca49 100644
    }
  
    if (ota_type == OtaType::AB) {
+-- 
+2.31.1
+

Patches/LineageOS-17.1/android_build/0001-Restore_TTS.patch

@@ -1,4 +1,4 @@
-From 13dca7d2cdaa7e4a3ffc3d5a16c716542fac4e88 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Fri, 25 Sep 2020 10:13:52 -0400
 Subject: [PATCH] Restore PicoTTS
@@ -14,7 +14,7 @@ Change-Id: I9aee2c5f739f9f08a27c71d54570517ed4aa413f
  2 files changed, 12 insertions(+)
 
 diff --git a/target/product/full_base.mk b/target/product/full_base.mk
-index f3fb8c306..e9f7079c0 100644
+index f3fb8c3066..e9f7079c02 100644
 --- a/target/product/full_base.mk
 +++ b/target/product/full_base.mk
 @@ -58,6 +58,9 @@ else
@@ -28,7 +28,7 @@ index f3fb8c306..e9f7079c0 100644
  $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
  
 diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
-index e5771cc94..6d2bc7c8a 100644
+index e5771cc941..6d2bc7c8a1 100644
 --- a/target/product/handheld_system.mk
 +++ b/target/product/handheld_system.mk
 @@ -31,6 +31,14 @@ $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk)
@@ -55,5 +55,5 @@ index e5771cc94..6d2bc7c8a 100644
      PrintSpooler \
      ProxyHandler \
 -- 
-2.26.2
+2.31.1
 

Patches/LineageOS-17.1/android_build/0002-OTA_Keys.patch

@@ -1,4 +1,4 @@
-From 1dd6a60f1fe8305f74795225a26a8301c690d898 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tad <tad@spotco.us>
 Date: Mon, 5 Apr 2021 22:55:30 -0400
 Subject: [PATCH] Allow setting OTA public keys from environment variable
@@ -10,10 +10,10 @@ Change-Id: I23c4acdff039f141afafcd0e736a341992f2f8ec
  2 files changed, 9 insertions(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index a5eef489f..64468d841 100644
+index f6c2463439..7f4823a1ac 100644
 --- a/core/Makefile
 +++ b/core/Makefile
-@@ -1891,6 +1891,10 @@ endif
+@@ -1895,6 +1895,10 @@ endif
  # substitute other keys for this one.
  OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
  
@@ -25,7 +25,7 @@ index a5eef489f..64468d841 100644
  # recovery binary.
  RECOVERY_INSTALL_OTA_KEYS := \
 diff --git a/core/product_config.mk b/core/product_config.mk
-index 9460357ca..be4bfec75 100644
+index 9460357ca1..be4bfec75e 100644
 --- a/core/product_config.mk
 +++ b/core/product_config.mk
 @@ -326,6 +326,11 @@ ENFORCE_SYSTEM_CERTIFICATE_WHITELIST := $(PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_RE
@@ -41,5 +41,5 @@ index 9460357ca..be4bfec75 100644
  DEXPREOPT_DISABLED_MODULES :=
  # If a module has multiple setups, the first takes precedence.
 -- 
-2.30.2
+2.31.1