diff --git a/Patches/LineageOS-15.1/android_packages_apps_Settings/0004-PDB_Fixes.patch b/Patches/LineageOS-15.1/android_packages_apps_Settings/0004-PDB_Fixes.patch deleted file mode 100644 index 84020416..00000000 --- a/Patches/LineageOS-15.1/android_packages_apps_Settings/0004-PDB_Fixes.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tad -Date: Mon, 23 Apr 2018 15:40:11 -0400 -Subject: [PATCH] Fix crashes when the PersistentDataBlockManager service isn't - available - -Change-Id: I58b82270ed052526004889deb8a2ede072e2da3b ---- - .../android/settings/MasterClearConfirm.java | 17 ++++++++++++----- - .../development/DevelopmentSettings.java | 5 ++++- - 2 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java -index 39bf01a0d9..8be58e8c85 100644 ---- a/src/com/android/settings/MasterClearConfirm.java -+++ b/src/com/android/settings/MasterClearConfirm.java -@@ -22,6 +22,7 @@ import android.content.Intent; - import android.content.pm.ActivityInfo; - import android.os.AsyncTask; - import android.os.Bundle; -+import android.os.SystemProperties; - import android.os.UserHandle; - import android.os.UserManager; - import android.service.oemlock.OemLockManager; -@@ -65,12 +66,18 @@ public class MasterClearConfirm extends OptionsMenuFragment { - return; - } - -- final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager) -- getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE); -- final OemLockManager oemLockManager = (OemLockManager) -- getActivity().getSystemService(Context.OEM_LOCK_SERVICE); -+ PersistentDataBlockManager pdbManagerTmp = null; -+ OemLockManager oemLockManager = null; -+ if (!SystemProperties.get("ro.frp.pst").equals("")) { -+ pdbManagerTmp = (PersistentDataBlockManager) -+ getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE); -+ oemLockManager = (OemLockManager) -+ getActivity().getSystemService(Context.OEM_LOCK_SERVICE); -+ } -+ -+ final PersistentDataBlockManager pdbManager = pdbManagerTmp; - -- if (pdbManager != null && !oemLockManager.isOemUnlockAllowed() && -+ if (pdbManager != null && oemLockManager != null && !oemLockManager.isOemUnlockAllowed() && - Utils.isDeviceProvisioned(getActivity())) { - // 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 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 - mBackupManager = IBackupManager.Stub.asInterface( - ServiceManager.getService(Context.BACKUP_SERVICE)); - mWebViewUpdateService = WebViewFactory.getUpdateService(); -- mOemLockManager = (OemLockManager) getSystemService(Context.OEM_LOCK_SERVICE); -+ mOemLockManager = null; -+ if(SystemProperties.getBoolean("ro.oem_unlock_supported", false)) { -+ mOemLockManager = (OemLockManager) getSystemService(Context.OEM_LOCK_SERVICE); -+ } - mTelephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - - mUm = (UserManager) getSystemService(Context.USER_SERVICE); diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch index a35ef178..5a4635eb 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch @@ -28,12 +28,12 @@ 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 ce8ba8c6eb..96223a68ce 100644 +index 7a4c93403e..894115bed2 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml -@@ -92,4 +92,7 @@ - Schnelles Laden - Deaktivieren, um die vom Gerät beim Laden erzeugte Wärme zu reduzieren oder die Lebensdauer des Akkus zu verlängern +@@ -97,4 +97,7 @@ + WLAN-Netzwerk auswählen + Erweiterte Benachrichtigungseinstellungen Setzt die Aktualisierungsrate für einige Inhalte automatisch von 60 auf %1$d Hz herauf. Erhöhter Akkuverbrauch. + Captive Portal Erkennung + Ein-/Ausschalten der Captive Portal Erkennung (Vorgabe EIN). diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 7c41d8e1..0f6e93d3 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -194,7 +194,6 @@ fi; if enterAndClear "packages/apps/Settings"; then git revert --no-edit a96df110e84123fe1273bff54feca3b4ca484dcd; #Don't hide OEM unlock applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch"; #Add option to disable captive portal checks (MSe1969) -applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0004-PDB_Fixes.patch"; #Fix crashes when the PersistentDataBlockManager service isn't available XXX: This might be broken! if [ "$DOS_SENSORS_PERM" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Sensors-P1.patch"; #Permission for sensors access (MSe1969) applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Sensors-P2.patch";