diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-18.1/android_frameworks_base/0007-Always_Restict_Serial.patch index b3883d2b..d8c09cab 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-18.1/android_frameworks_base/0007-Always_Restict_Serial.patch @@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index 07dab575e476..1f3452d1b0b3 100644 +index 5e0ce6eadc95..d49d3ad867fd 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -5269,12 +5269,7 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -5285,12 +5285,7 @@ public class ActivityManagerService extends IActivityManager.Stub } } diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch index 675c051f..42fe0507 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch @@ -27,7 +27,7 @@ Change-Id: I8a762d0f29ac42fce3dcfc7189e8ff216a8f8d1a create mode 100644 src/com/android/settings/network/ConnectivityCheckPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index 617548cadc..e1976fb5cf 100644 +index 617548cadcb..e1976fb5cf0 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -110,6 +110,36 @@ @@ -68,7 +68,7 @@ index 617548cadc..e1976fb5cf 100644 These are shown in a list dialog. --> diff --git a/res/values/strings.xml b/res/values/strings.xml -index a7a338ed7a..8d8e7aaccd 100644 +index a7a338ed7a2..8d8e7aaccdd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12237,4 +12237,7 @@ @@ -80,7 +80,7 @@ index a7a338ed7a..8d8e7aaccd 100644 + HTTP endpoints to use for performing internet connectivity checks. diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml -index 6bf6dbaccf..8ee092aa04 100644 +index 6bf6dbaccf7..8ee092aa044 100644 --- a/res/xml/network_and_internet.xml +++ b/res/xml/network_and_internet.xml @@ -125,4 +125,12 @@ @@ -98,7 +98,7 @@ index 6bf6dbaccf..8ee092aa04 100644 diff --git a/src/com/android/settings/network/ConnectivityCheckPreferenceController.java b/src/com/android/settings/network/ConnectivityCheckPreferenceController.java new file mode 100644 -index 0000000000..9b6e9bb93b +index 00000000000..9b6e9bb93b1 --- /dev/null +++ b/src/com/android/settings/network/ConnectivityCheckPreferenceController.java @@ -0,0 +1,399 @@ @@ -502,7 +502,7 @@ index 0000000000..9b6e9bb93b + private boolean isDisabledByAdmin() { return getEnforcedAdmin() != null; } +} diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java -index db704ae850..c77b07821e 100644 +index db704ae850d..c77b07821e1 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -103,6 +103,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch index e5f2285c..4794c640 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch @@ -11,7 +11,7 @@ Change-Id: Ic1dce1c0fffc3c3f6459c4c85e0a64d480d3315a 2 files changed, 55 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 35915381a1..f9c790839a 100644 +index 35915381a16..f9c790839a6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3135,19 +3135,6 @@ @@ -35,7 +35,7 @@ index 35915381a1..f9c790839a 100644 android:name=".development.qstile.DevelopmentTiles$WirelessDebugging" android:label="@string/enable_adb_wireless" diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java -index 916c6c9291..fd92d17a60 100644 +index 916c6c92918..fd92d17a600 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -26,7 +26,6 @@ import android.content.Context; diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0004-Private_DNS.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0004-Private_DNS.patch index 42a4ad26..8e661724 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0004-Private_DNS.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0004-Private_DNS.patch @@ -21,7 +21,7 @@ Change-Id: I423ad5a3c360a687a226e61df3f75b5550f851c0 4 files changed, 224 insertions(+) diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml -index 0b4f4db6c4..ca6a2cf62d 100644 +index 0b4f4db6c4b..ca6a2cf62dd 100644 --- a/res/layout/private_dns_mode_dialog.xml +++ b/res/layout/private_dns_mode_dialog.xml @@ -35,6 +35,58 @@ @@ -84,7 +84,7 @@ index 0b4f4db6c4..ca6a2cf62d 100644 android:id="@+id/private_dns_mode_opportunistic" layout="@layout/preference_widget_dialog_radiobutton"/> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml -index d13d4d4fe8..90f8829027 100644 +index d13d4d4fe85..90f88290271 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -137,6 +137,21 @@ @@ -110,7 +110,7 @@ index d13d4d4fe8..90f8829027 100644 Prevent accidental wake-up Check the proximity sensor prior to waking up screen diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java -index 3fc5086cd6..abfb5b4470 100644 +index 3fc5086cd68..abfb5b4470d 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -17,6 +17,19 @@ package com.android.settings.network; @@ -234,7 +234,7 @@ index 3fc5086cd6..abfb5b4470 100644 mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC; } else if (checkedId == R.id.private_dns_mode_provider) { diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java -index 22633e0081..4a55ac5c2b 100644 +index 22633e0081a..4a55ac5c2be 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -17,6 +17,19 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch index 85307965..da57abf3 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch @@ -13,7 +13,7 @@ Subject: [PATCH] add auto-reboot setting create mode 100644 src/com/android/settings/security/AutoRebootPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index e1976fb5cf..4c45ded7fa 100644 +index e1976fb5cf0..4c45ded7faa 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -176,6 +176,37 @@ @@ -55,7 +55,7 @@ index e1976fb5cf..4c45ded7fa 100644 Small Default diff --git a/res/values/strings.xml b/res/values/strings.xml -index 8d8e7aaccd..21e752e0e2 100644 +index 8d8e7aaccdd..21e752e0e23 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -647,6 +647,9 @@ @@ -69,7 +69,7 @@ index 8d8e7aaccd..21e752e0e2 100644 Lock screen when trust is lost diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml -index b5dcebf6d9..dfb0db65e5 100644 +index b5dcebf6d99..dfb0db65e5f 100644 --- a/res/xml/security_dashboard_settings.xml +++ b/res/xml/security_dashboard_settings.xml @@ -55,6 +55,14 @@ @@ -96,7 +96,7 @@ index b5dcebf6d9..dfb0db65e5 100644 + diff --git a/src/com/android/settings/security/AutoRebootPreferenceController.java b/src/com/android/settings/security/AutoRebootPreferenceController.java new file mode 100644 -index 0000000000..c7a75219a5 +index 00000000000..c7a75219a5e --- /dev/null +++ b/src/com/android/settings/security/AutoRebootPreferenceController.java @@ -0,0 +1,82 @@ @@ -183,7 +183,7 @@ index 0000000000..c7a75219a5 + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 2f2b349c72..953012f9e7 100644 +index 2f2b349c72a..953012f9e7b 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -118,6 +118,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch index 9385844b..a8e88cdd 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add bluetooth auto-turn-off setting create mode 100644 src/com/android/settings/bluetooth/BluetoothTimeoutPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index 4c45ded7fa..a36f468bfc 100644 +index 4c45ded7faa..a36f468bfcd 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -39,6 +39,50 @@ @@ -67,7 +67,7 @@ index 4c45ded7fa..a36f468bfc 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 21e752e0e2..25121ea49f 100644 +index 21e752e0e23..25121ea49fc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -27,6 +27,25 @@ @@ -97,7 +97,7 @@ index 21e752e0e2..25121ea49f 100644 Unknown diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml -index 644ce03299..039f253f9e 100644 +index 644ce032998..039f253f9e9 100644 --- a/res/xml/connected_devices.xml +++ b/res/xml/connected_devices.xml @@ -53,6 +53,14 @@ @@ -117,7 +117,7 @@ index 644ce03299..039f253f9e 100644 android:title="@string/connected_device_previously_connected_title" diff --git a/src/com/android/settings/bluetooth/BluetoothTimeoutPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothTimeoutPreferenceController.java new file mode 100644 -index 0000000000..244147948a +index 00000000000..244147948aa --- /dev/null +++ b/src/com/android/settings/bluetooth/BluetoothTimeoutPreferenceController.java @@ -0,0 +1,115 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch index 9fb57d00..cd982878 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add Wi-Fi timeout feature create mode 100644 src/com/android/settings/wifi/WifiTimeoutPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index a36f468bfc..83345cbceb 100644 +index a36f468bfcd..83345cbceba 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -83,6 +83,50 @@ @@ -67,7 +67,7 @@ index a36f468bfc..83345cbceb 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 25121ea49f..b3408ee49a 100644 +index 25121ea49fc..b3408ee49ac 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -46,6 +46,25 @@ @@ -97,7 +97,7 @@ index 25121ea49f..b3408ee49a 100644 Unknown diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml -index cc281fa876..98d28f053b 100644 +index cc281fa8768..98d28f053b1 100644 --- a/res/xml/wifi_configure_settings.xml +++ b/res/xml/wifi_configure_settings.xml @@ -26,6 +26,14 @@ @@ -117,7 +117,7 @@ index cc281fa876..98d28f053b 100644 android:icon="@drawable/ic_open_wifi_autoconnect" diff --git a/src/com/android/settings/wifi/WifiTimeoutPreferenceController.java b/src/com/android/settings/wifi/WifiTimeoutPreferenceController.java new file mode 100644 -index 0000000000..7116c90519 +index 00000000000..7116c905190 --- /dev/null +++ b/src/com/android/settings/wifi/WifiTimeoutPreferenceController.java @@ -0,0 +1,115 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch index f57e4e95..9165b80a 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add native debugging setting create mode 100644 src/com/android/settings/security/NativeDebugPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index b3408ee49a..26ad0e54b2 100644 +index b3408ee49ac..26ad0e54b2c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11957,6 +11957,9 @@ @@ -26,7 +26,7 @@ index b3408ee49a..26ad0e54b2 100644 Enable blurs diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml -index dfb0db65e5..06b3511ceb 100644 +index dfb0db65e5f..06b3511cebf 100644 --- a/res/xml/security_dashboard_settings.xml +++ b/res/xml/security_dashboard_settings.xml @@ -63,6 +63,12 @@ @@ -44,7 +44,7 @@ index dfb0db65e5..06b3511ceb 100644 diff --git a/src/com/android/settings/security/NativeDebugPreferenceController.java b/src/com/android/settings/security/NativeDebugPreferenceController.java new file mode 100644 -index 0000000000..9271e6e21c +index 00000000000..9271e6e21cf --- /dev/null +++ b/src/com/android/settings/security/NativeDebugPreferenceController.java @@ -0,0 +1,106 @@ @@ -155,7 +155,7 @@ index 0000000000..9271e6e21c + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 953012f9e7..6f939d3165 100644 +index 953012f9e7b..6f939d31657 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -119,6 +119,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch index 8401a606..a13d6221 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch @@ -10,7 +10,7 @@ Subject: [PATCH] UserManager app installation restrictions 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml -index d7f32ee319..d723977899 100644 +index d7f32ee3194..d723977899f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7088,6 +7088,8 @@ @@ -23,7 +23,7 @@ index d7f32ee319..d723977899 100644 Delete user diff --git a/res/xml/user_details_settings.xml b/res/xml/user_details_settings.xml -index 9280ff1163..d0a055fae2 100644 +index 9280ff11632..d0a055fae29 100644 --- a/res/xml/user_details_settings.xml +++ b/res/xml/user_details_settings.xml @@ -29,6 +29,10 @@ @@ -38,7 +38,7 @@ index 9280ff1163..d0a055fae2 100644 android:key="remove_user" android:icon="@drawable/ic_delete" diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java -index 897b3c7b83..dc5dfb1dcc 100644 +index 897b3c7b83a..dc5dfb1dcca 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -59,6 +59,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch index 68609d73..a5bee27d 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add exec spawning toggle create mode 100644 src/com/android/settings/security/ExecSpawnPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 26ad0e54b2..d7f32ee319 100644 +index 26ad0e54b2c..d7f32ee3194 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11957,6 +11957,8 @@ @@ -25,7 +25,7 @@ index 26ad0e54b2..d7f32ee319 100644 Generate useful logs / bug reports from crashes and permit debugging native code. diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml -index 06b3511ceb..75cc0b261d 100644 +index 06b3511cebf..75cc0b261d3 100644 --- a/res/xml/security_dashboard_settings.xml +++ b/res/xml/security_dashboard_settings.xml @@ -64,6 +64,12 @@ @@ -43,7 +43,7 @@ index 06b3511ceb..75cc0b261d 100644 android:title="@string/native_debug_title" diff --git a/src/com/android/settings/security/ExecSpawnPreferenceController.java b/src/com/android/settings/security/ExecSpawnPreferenceController.java new file mode 100644 -index 0000000000..98cc3c29e1 +index 00000000000..98cc3c29e12 --- /dev/null +++ b/src/com/android/settings/security/ExecSpawnPreferenceController.java @@ -0,0 +1,106 @@ @@ -154,7 +154,7 @@ index 0000000000..98cc3c29e1 + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 6f939d3165..387814c406 100644 +index 6f939d31657..387814c406b 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -119,6 +119,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-1.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-1.patch index 9df9f092..6b24e725 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-1.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-1.patch @@ -13,7 +13,7 @@ RANDOMIZATION_ALWAYS is set as the default option 5 files changed, 56 insertions(+), 17 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index 83345cbceb..79e036a04c 100644 +index 83345cbceba..79e036a04cb 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1362,7 +1362,8 @@ @@ -35,7 +35,7 @@ index 83345cbceb..79e036a04c 100644 0 diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java -index 8dd8d7ad6a..d900bc6a27 100644 +index 8dd8d7ad6a4..d900bc6a27c 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -822,7 +822,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController @@ -58,7 +58,7 @@ index 8dd8d7ad6a..d900bc6a27 100644 : R.string.wifi_advanced_device_mac_address_title); diff --git a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java -index 6658411479..2266805808 100644 +index 6658411479d..22668058089 100644 --- a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java @@ -115,11 +115,12 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im @@ -116,7 +116,7 @@ index 6658411479..2266805808 100644 private void updateSummary(DropDownPreference preference, int macRandomized) { diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java -index 9b305777fd..f04bbcd38f 100644 +index 9b305777fd3..f04bbcd38f3 100644 --- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java @@ -749,7 +749,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle @@ -129,7 +129,7 @@ index 9b305777fd..f04bbcd38f 100644 : R.string.wifi_advanced_device_mac_address_title); diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java -index d6e1b6054d..ab51c59e1a 100644 +index d6e1b6054d3..ab51c59e1a6 100644 --- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java @@ -100,8 +100,9 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-2.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-2.patch index c06f17df..86bc484b 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-2.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-2.patch @@ -92,7 +92,7 @@ Subject: [PATCH] remove partial MAC randomization translations 85 files changed, 340 deletions(-) diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml -index 5b8ed28439..be4355ad42 100644 +index 5b8ed284398..be4355ad429 100644 --- a/res/values-af/arrays.xml +++ b/res/values-af/arrays.xml @@ -493,10 +493,6 @@ @@ -107,7 +107,7 @@ index 5b8ed28439..be4355ad42 100644 "Nee" "Ja" diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml -index f44cb4809e..a343c0916f 100644 +index f44cb4809e2..a343c0916fd 100644 --- a/res/values-am/arrays.xml +++ b/res/values-am/arrays.xml @@ -493,10 +493,6 @@ @@ -122,7 +122,7 @@ index f44cb4809e..a343c0916f 100644 "አይ" "አዎ" diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml -index 4218a24b19..d0f3705583 100644 +index 4218a24b193..d0f3705583d 100644 --- a/res/values-ar/arrays.xml +++ b/res/values-ar/arrays.xml @@ -493,10 +493,6 @@ @@ -137,7 +137,7 @@ index 4218a24b19..d0f3705583 100644 "لا" "نعم" diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml -index ac224cbb33..d58efd7d84 100644 +index ac224cbb331..d58efd7d84d 100644 --- a/res/values-as/arrays.xml +++ b/res/values-as/arrays.xml @@ -493,10 +493,6 @@ @@ -152,7 +152,7 @@ index ac224cbb33..d58efd7d84 100644 "নহয়" "হয়" diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml -index 1a73dd637e..370387554f 100644 +index 1a73dd637e5..370387554f4 100644 --- a/res/values-az/arrays.xml +++ b/res/values-az/arrays.xml @@ -493,10 +493,6 @@ @@ -167,7 +167,7 @@ index 1a73dd637e..370387554f 100644 "Xeyr" "Bəli" diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml -index c58829c465..d072a0cbea 100644 +index c58829c465e..d072a0cbea6 100644 --- a/res/values-b+sr+Latn/arrays.xml +++ b/res/values-b+sr+Latn/arrays.xml @@ -493,10 +493,6 @@ @@ -182,7 +182,7 @@ index c58829c465..d072a0cbea 100644 "Ne" "Da" diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml -index 0e22b482df..8489cbbea3 100644 +index 0e22b482dff..8489cbbea3c 100644 --- a/res/values-be/arrays.xml +++ b/res/values-be/arrays.xml @@ -493,10 +493,6 @@ @@ -197,7 +197,7 @@ index 0e22b482df..8489cbbea3 100644 "Не" "Так" diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml -index 6960746676..8a6c7315ab 100644 +index 69607466766..8a6c7315ab9 100644 --- a/res/values-bg/arrays.xml +++ b/res/values-bg/arrays.xml @@ -493,10 +493,6 @@ @@ -212,7 +212,7 @@ index 6960746676..8a6c7315ab 100644 "Не" "Да" diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml -index 8b5aaa17c6..5ec3f390df 100644 +index 8b5aaa17c69..5ec3f390df8 100644 --- a/res/values-bn/arrays.xml +++ b/res/values-bn/arrays.xml @@ -493,10 +493,6 @@ @@ -227,7 +227,7 @@ index 8b5aaa17c6..5ec3f390df 100644 "না" "হ্যাঁ" diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml -index 7887d4ace3..89d6319717 100644 +index 7887d4ace3d..89d6319717e 100644 --- a/res/values-bs/arrays.xml +++ b/res/values-bs/arrays.xml @@ -493,10 +493,6 @@ @@ -242,7 +242,7 @@ index 7887d4ace3..89d6319717 100644 "Ne" "Da" diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml -index 30fa788c9b..aaf9df2524 100644 +index 30fa788c9bd..aaf9df25241 100644 --- a/res/values-ca/arrays.xml +++ b/res/values-ca/arrays.xml @@ -493,10 +493,6 @@ @@ -257,7 +257,7 @@ index 30fa788c9b..aaf9df2524 100644 "No" "Sí" diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml -index 179cd3bf9b..c241bd3fb9 100644 +index 179cd3bf9b6..c241bd3fb9a 100644 --- a/res/values-cs/arrays.xml +++ b/res/values-cs/arrays.xml @@ -493,10 +493,6 @@ @@ -272,7 +272,7 @@ index 179cd3bf9b..c241bd3fb9 100644 "Ne" "Ano" diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml -index 2aa7c34f16..ba99b7518f 100644 +index 2aa7c34f160..ba99b7518f7 100644 --- a/res/values-da/arrays.xml +++ b/res/values-da/arrays.xml @@ -493,10 +493,6 @@ @@ -287,7 +287,7 @@ index 2aa7c34f16..ba99b7518f 100644 "Nej" "Ja" diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml -index e1b59f2c4f..ad443fdba3 100644 +index e1b59f2c4f3..ad443fdba34 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -493,10 +493,6 @@ @@ -302,7 +302,7 @@ index e1b59f2c4f..ad443fdba3 100644 "Nein" "Ja" diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml -index e0d0aa777e..5ebebacb42 100644 +index e0d0aa777e3..5ebebacb424 100644 --- a/res/values-el/arrays.xml +++ b/res/values-el/arrays.xml @@ -493,10 +493,6 @@ @@ -317,7 +317,7 @@ index e0d0aa777e..5ebebacb42 100644 "Όχι" "Ναι" diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml -index ec8510a50e..a06b19a556 100644 +index ec8510a50e6..a06b19a5563 100644 --- a/res/values-en-rAU/arrays.xml +++ b/res/values-en-rAU/arrays.xml @@ -493,10 +493,6 @@ @@ -332,7 +332,7 @@ index ec8510a50e..a06b19a556 100644 "No" "Yes" diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml -index 47c9e00e40..a06b19a556 100644 +index 47c9e00e40b..a06b19a5563 100644 --- a/res/values-en-rCA/arrays.xml +++ b/res/values-en-rCA/arrays.xml @@ -493,10 +493,6 @@ @@ -347,7 +347,7 @@ index 47c9e00e40..a06b19a556 100644 "No" "Yes" diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml -index ec8510a50e..a06b19a556 100644 +index ec8510a50e6..a06b19a5563 100644 --- a/res/values-en-rGB/arrays.xml +++ b/res/values-en-rGB/arrays.xml @@ -493,10 +493,6 @@ @@ -362,7 +362,7 @@ index ec8510a50e..a06b19a556 100644 "No" "Yes" diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml -index ec8510a50e..a06b19a556 100644 +index ec8510a50e6..a06b19a5563 100644 --- a/res/values-en-rIN/arrays.xml +++ b/res/values-en-rIN/arrays.xml @@ -493,10 +493,6 @@ @@ -377,7 +377,7 @@ index ec8510a50e..a06b19a556 100644 "No" "Yes" diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml -index d900cd1feb..cd7ded213a 100644 +index d900cd1feb9..cd7ded213ad 100644 --- a/res/values-en-rXC/arrays.xml +++ b/res/values-en-rXC/arrays.xml @@ -493,10 +493,6 @@ @@ -392,7 +392,7 @@ index d900cd1feb..cd7ded213a 100644 "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎No‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎Yes‎‏‎‎‏‎" diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml -index b88ae64cdb..30bcf95977 100644 +index b88ae64cdb1..30bcf959777 100644 --- a/res/values-es-rUS/arrays.xml +++ b/res/values-es-rUS/arrays.xml @@ -493,10 +493,6 @@ @@ -407,7 +407,7 @@ index b88ae64cdb..30bcf95977 100644 "No" "Sí" diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml -index 1f2dc1ad43..da3d30e84b 100644 +index 1f2dc1ad438..da3d30e84b7 100644 --- a/res/values-es/arrays.xml +++ b/res/values-es/arrays.xml @@ -493,10 +493,6 @@ @@ -422,7 +422,7 @@ index 1f2dc1ad43..da3d30e84b 100644 "No" "Sí" diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml -index 036cf5fa1c..c9924740f8 100644 +index 036cf5fa1c0..c9924740f8f 100644 --- a/res/values-et/arrays.xml +++ b/res/values-et/arrays.xml @@ -493,10 +493,6 @@ @@ -437,7 +437,7 @@ index 036cf5fa1c..c9924740f8 100644 "Ei" "Jah" diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml -index ff3a8a92bd..18b3302c91 100644 +index ff3a8a92bd2..18b3302c91a 100644 --- a/res/values-eu/arrays.xml +++ b/res/values-eu/arrays.xml @@ -493,10 +493,6 @@ @@ -452,7 +452,7 @@ index ff3a8a92bd..18b3302c91 100644 "Ez" "Bai" diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml -index 9f010de3ee..67d2a51ba6 100644 +index 9f010de3eec..67d2a51ba6a 100644 --- a/res/values-fa/arrays.xml +++ b/res/values-fa/arrays.xml @@ -493,10 +493,6 @@ @@ -467,7 +467,7 @@ index 9f010de3ee..67d2a51ba6 100644 "نه" "بله" diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml -index 92a3668e0b..dbb5afb461 100644 +index 92a3668e0bc..dbb5afb461c 100644 --- a/res/values-fi/arrays.xml +++ b/res/values-fi/arrays.xml @@ -493,10 +493,6 @@ @@ -482,7 +482,7 @@ index 92a3668e0b..dbb5afb461 100644 "Ei" "Kyllä" diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml -index 70688e9f99..2f322a7c53 100644 +index 70688e9f99a..2f322a7c532 100644 --- a/res/values-fr-rCA/arrays.xml +++ b/res/values-fr-rCA/arrays.xml @@ -493,10 +493,6 @@ @@ -497,7 +497,7 @@ index 70688e9f99..2f322a7c53 100644 "Non" "Oui" diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml -index 93d84fd69b..75340a00c7 100644 +index 93d84fd69b3..75340a00c71 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -493,10 +493,6 @@ @@ -512,7 +512,7 @@ index 93d84fd69b..75340a00c7 100644 "Non" "Oui" diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml -index 7aa91b8205..9c6e76bdc1 100644 +index 7aa91b82059..9c6e76bdc17 100644 --- a/res/values-gl/arrays.xml +++ b/res/values-gl/arrays.xml @@ -493,10 +493,6 @@ @@ -527,7 +527,7 @@ index 7aa91b8205..9c6e76bdc1 100644 "Non" "Si" diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml -index 4c86afb43d..63c66d6dd7 100644 +index 4c86afb43d0..63c66d6dd7b 100644 --- a/res/values-gu/arrays.xml +++ b/res/values-gu/arrays.xml @@ -493,10 +493,6 @@ @@ -542,7 +542,7 @@ index 4c86afb43d..63c66d6dd7 100644 "ના" "હા" diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml -index 322456e9ed..1ab9d6c8ff 100644 +index 322456e9ed8..1ab9d6c8ff9 100644 --- a/res/values-hi/arrays.xml +++ b/res/values-hi/arrays.xml @@ -493,10 +493,6 @@ @@ -557,7 +557,7 @@ index 322456e9ed..1ab9d6c8ff 100644 "नहीं" "हां" diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml -index 5c322b27b2..03a6f70ce4 100644 +index 5c322b27b22..03a6f70ce48 100644 --- a/res/values-hr/arrays.xml +++ b/res/values-hr/arrays.xml @@ -493,10 +493,6 @@ @@ -572,7 +572,7 @@ index 5c322b27b2..03a6f70ce4 100644 "Ne" "Da" diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml -index 8ea94c5485..e8a06c798c 100644 +index 8ea94c54851..e8a06c798c1 100644 --- a/res/values-hu/arrays.xml +++ b/res/values-hu/arrays.xml @@ -493,10 +493,6 @@ @@ -587,7 +587,7 @@ index 8ea94c5485..e8a06c798c 100644 "Nem" "Igen" diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml -index 50238b9472..85c7718b22 100644 +index 50238b94729..85c7718b225 100644 --- a/res/values-hy/arrays.xml +++ b/res/values-hy/arrays.xml @@ -493,10 +493,6 @@ @@ -602,7 +602,7 @@ index 50238b9472..85c7718b22 100644 "Ոչ" "Այո" diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml -index 0974a2b1fb..047bab995e 100644 +index 0974a2b1fbb..047bab995e1 100644 --- a/res/values-in/arrays.xml +++ b/res/values-in/arrays.xml @@ -493,10 +493,6 @@ @@ -617,7 +617,7 @@ index 0974a2b1fb..047bab995e 100644 "Tidak" "Ya" diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml -index 90d6b3be01..0eb94fcc54 100644 +index 90d6b3be01d..0eb94fcc543 100644 --- a/res/values-is/arrays.xml +++ b/res/values-is/arrays.xml @@ -493,10 +493,6 @@ @@ -632,7 +632,7 @@ index 90d6b3be01..0eb94fcc54 100644 "Nei" "Já" diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml -index 5a9f87f85c..afd37aa5df 100644 +index 5a9f87f85c3..afd37aa5df0 100644 --- a/res/values-it/arrays.xml +++ b/res/values-it/arrays.xml @@ -493,10 +493,6 @@ @@ -647,7 +647,7 @@ index 5a9f87f85c..afd37aa5df 100644 "No" "Sì" diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml -index 1015c32ac6..a7a208034d 100644 +index 1015c32ac69..a7a208034d9 100644 --- a/res/values-iw/arrays.xml +++ b/res/values-iw/arrays.xml @@ -493,10 +493,6 @@ @@ -662,7 +662,7 @@ index 1015c32ac6..a7a208034d 100644 "לא" "כן" diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml -index a73bef3548..0b7e9f118c 100644 +index a73bef35487..0b7e9f118ca 100644 --- a/res/values-ja/arrays.xml +++ b/res/values-ja/arrays.xml @@ -493,10 +493,6 @@ @@ -677,7 +677,7 @@ index a73bef3548..0b7e9f118c 100644 "いいえ" "はい" diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml -index 077403f35f..0decbcd3b3 100644 +index 077403f35f3..0decbcd3b39 100644 --- a/res/values-ka/arrays.xml +++ b/res/values-ka/arrays.xml @@ -493,10 +493,6 @@ @@ -692,7 +692,7 @@ index 077403f35f..0decbcd3b3 100644 "არა" "დიახ" diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml -index a69562f1b9..69144b7ae0 100644 +index a69562f1b99..69144b7ae09 100644 --- a/res/values-kk/arrays.xml +++ b/res/values-kk/arrays.xml @@ -493,10 +493,6 @@ @@ -707,7 +707,7 @@ index a69562f1b9..69144b7ae0 100644 "Жоқ" "Иә" diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml -index d074efd436..78c28f3276 100644 +index d074efd4367..78c28f3276e 100644 --- a/res/values-km/arrays.xml +++ b/res/values-km/arrays.xml @@ -493,10 +493,6 @@ @@ -722,7 +722,7 @@ index d074efd436..78c28f3276 100644 "ទេ" "បាទ/ចាស" diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml -index e858ca660f..3f1cce11dd 100644 +index e858ca660fd..3f1cce11dd5 100644 --- a/res/values-kn/arrays.xml +++ b/res/values-kn/arrays.xml @@ -493,10 +493,6 @@ @@ -737,7 +737,7 @@ index e858ca660f..3f1cce11dd 100644 "ಇಲ್ಲ" "ಹೌದು" diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml -index 8c61c6b50b..27f30fbf06 100644 +index 8c61c6b50bd..27f30fbf06f 100644 --- a/res/values-ko/arrays.xml +++ b/res/values-ko/arrays.xml @@ -493,10 +493,6 @@ @@ -752,7 +752,7 @@ index 8c61c6b50b..27f30fbf06 100644 "아니요" "예" diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml -index 0cd420ac62..a8360801e1 100644 +index 0cd420ac62c..a8360801e19 100644 --- a/res/values-ky/arrays.xml +++ b/res/values-ky/arrays.xml @@ -493,10 +493,6 @@ @@ -767,7 +767,7 @@ index 0cd420ac62..a8360801e1 100644 "Жок" "Ооба" diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml -index 2568a52c76..5f2702b085 100644 +index 2568a52c76e..5f2702b0858 100644 --- a/res/values-lo/arrays.xml +++ b/res/values-lo/arrays.xml @@ -493,10 +493,6 @@ @@ -782,7 +782,7 @@ index 2568a52c76..5f2702b085 100644 "ບໍ່" "ແມ່ນ" diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml -index d423cd5cea..9a7480d938 100644 +index d423cd5cea3..9a7480d938a 100644 --- a/res/values-lt/arrays.xml +++ b/res/values-lt/arrays.xml @@ -493,10 +493,6 @@ @@ -797,7 +797,7 @@ index d423cd5cea..9a7480d938 100644 "Ne" "Taip" diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml -index f3d5006230..3b8953b0fb 100644 +index f3d50062307..3b8953b0fbc 100644 --- a/res/values-lv/arrays.xml +++ b/res/values-lv/arrays.xml @@ -493,10 +493,6 @@ @@ -812,7 +812,7 @@ index f3d5006230..3b8953b0fb 100644 "Nē" "Jā" diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml -index 1517863d68..809514238c 100644 +index 1517863d68b..809514238c7 100644 --- a/res/values-mk/arrays.xml +++ b/res/values-mk/arrays.xml @@ -493,10 +493,6 @@ @@ -827,7 +827,7 @@ index 1517863d68..809514238c 100644 "Не" "Да" diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml -index 2edb09ed8e..0623933ea0 100644 +index 2edb09ed8e6..0623933ea0d 100644 --- a/res/values-ml/arrays.xml +++ b/res/values-ml/arrays.xml @@ -493,10 +493,6 @@ @@ -842,7 +842,7 @@ index 2edb09ed8e..0623933ea0 100644 "ഇല്ല" "ഉവ്വ്" diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml -index 0c9940e6af..b0f8077c35 100644 +index 0c9940e6af1..b0f8077c35b 100644 --- a/res/values-mn/arrays.xml +++ b/res/values-mn/arrays.xml @@ -493,10 +493,6 @@ @@ -857,7 +857,7 @@ index 0c9940e6af..b0f8077c35 100644 "Үгүй" "Тийм" diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml -index 4a25f9e007..b06821c178 100644 +index 4a25f9e0077..b06821c178f 100644 --- a/res/values-mr/arrays.xml +++ b/res/values-mr/arrays.xml @@ -493,10 +493,6 @@ @@ -872,7 +872,7 @@ index 4a25f9e007..b06821c178 100644 "नाही" "होय" diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml -index 9a9aadc48a..5a9f48c5c8 100644 +index 9a9aadc48ac..5a9f48c5c86 100644 --- a/res/values-ms/arrays.xml +++ b/res/values-ms/arrays.xml @@ -493,10 +493,6 @@ @@ -887,7 +887,7 @@ index 9a9aadc48a..5a9f48c5c8 100644 "Tidak" "Ya" diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml -index 60f8af9a28..88bd581d27 100644 +index 60f8af9a287..88bd581d270 100644 --- a/res/values-my/arrays.xml +++ b/res/values-my/arrays.xml @@ -493,10 +493,6 @@ @@ -902,7 +902,7 @@ index 60f8af9a28..88bd581d27 100644 "No" "Yes" diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml -index 951578c2c0..8ce027dae4 100644 +index 951578c2c07..8ce027dae41 100644 --- a/res/values-nb/arrays.xml +++ b/res/values-nb/arrays.xml @@ -493,10 +493,6 @@ @@ -917,7 +917,7 @@ index 951578c2c0..8ce027dae4 100644 "Nei" "Ja" diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml -index e891c0fbb4..8348ba1a8a 100644 +index e891c0fbb4a..8348ba1a8a1 100644 --- a/res/values-ne/arrays.xml +++ b/res/values-ne/arrays.xml @@ -493,10 +493,6 @@ @@ -932,7 +932,7 @@ index e891c0fbb4..8348ba1a8a 100644 "होइन" "हो" diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml -index 20ac6f3dba..3654b8bbe8 100644 +index 20ac6f3dba6..3654b8bbe8d 100644 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -493,10 +493,6 @@ @@ -947,7 +947,7 @@ index 20ac6f3dba..3654b8bbe8 100644 "Nee" "Ja" diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml -index 7bf91931c0..f68bb2470c 100644 +index 7bf91931c09..f68bb2470ce 100644 --- a/res/values-or/arrays.xml +++ b/res/values-or/arrays.xml @@ -493,10 +493,6 @@ @@ -962,7 +962,7 @@ index 7bf91931c0..f68bb2470c 100644 "ନା" "ହଁ" diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml -index dc7a4c34d8..dcb21ecffc 100644 +index dc7a4c34d8e..dcb21ecffc3 100644 --- a/res/values-pa/arrays.xml +++ b/res/values-pa/arrays.xml @@ -493,10 +493,6 @@ @@ -977,7 +977,7 @@ index dc7a4c34d8..dcb21ecffc 100644 "ਨਹੀਂ" "ਹਾਂ" diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml -index c2c4ed0f2a..7c1e026dac 100644 +index c2c4ed0f2ae..7c1e026dac1 100644 --- a/res/values-pl/arrays.xml +++ b/res/values-pl/arrays.xml @@ -493,10 +493,6 @@ @@ -992,7 +992,7 @@ index c2c4ed0f2a..7c1e026dac 100644 "Nie" "Tak" diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml -index 389a7d8265..e8133c006d 100644 +index 389a7d82651..e8133c006d2 100644 --- a/res/values-pt-rBR/arrays.xml +++ b/res/values-pt-rBR/arrays.xml @@ -493,10 +493,6 @@ @@ -1007,7 +1007,7 @@ index 389a7d8265..e8133c006d 100644 "Não" "Sim" diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml -index 319ef23b12..9f712e31b5 100644 +index 319ef23b12c..9f712e31b53 100644 --- a/res/values-pt-rPT/arrays.xml +++ b/res/values-pt-rPT/arrays.xml @@ -493,10 +493,6 @@ @@ -1022,7 +1022,7 @@ index 319ef23b12..9f712e31b5 100644 "Não" "Sim" diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml -index 389a7d8265..e8133c006d 100644 +index 389a7d82651..e8133c006d2 100644 --- a/res/values-pt/arrays.xml +++ b/res/values-pt/arrays.xml @@ -493,10 +493,6 @@ @@ -1037,7 +1037,7 @@ index 389a7d8265..e8133c006d 100644 "Não" "Sim" diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml -index e069752b51..bdbdd44aaf 100644 +index e069752b519..bdbdd44aaf1 100644 --- a/res/values-ro/arrays.xml +++ b/res/values-ro/arrays.xml @@ -493,10 +493,6 @@ @@ -1052,7 +1052,7 @@ index e069752b51..bdbdd44aaf 100644 "Nu" "Da" diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml -index c78d052c71..8721192709 100644 +index c78d052c714..87211927095 100644 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -493,10 +493,6 @@ @@ -1067,7 +1067,7 @@ index c78d052c71..8721192709 100644 "Нет" "Да" diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml -index e67cd3c1b4..e664c59454 100644 +index e67cd3c1b48..e664c594546 100644 --- a/res/values-si/arrays.xml +++ b/res/values-si/arrays.xml @@ -493,10 +493,6 @@ @@ -1082,7 +1082,7 @@ index e67cd3c1b4..e664c59454 100644 "නැත" "ඔව්" diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml -index 3c68c3389d..5ed95595e4 100644 +index 3c68c3389d5..5ed95595e4a 100644 --- a/res/values-sk/arrays.xml +++ b/res/values-sk/arrays.xml @@ -493,10 +493,6 @@ @@ -1097,7 +1097,7 @@ index 3c68c3389d..5ed95595e4 100644 "Nie" "Áno" diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml -index 635df4dfda..b527644575 100644 +index 635df4dfdae..b527644575f 100644 --- a/res/values-sl/arrays.xml +++ b/res/values-sl/arrays.xml @@ -493,10 +493,6 @@ @@ -1112,7 +1112,7 @@ index 635df4dfda..b527644575 100644 "Ne" "Da" diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml -index 305b0721a5..fb593d99db 100644 +index 305b0721a5c..fb593d99db9 100644 --- a/res/values-sq/arrays.xml +++ b/res/values-sq/arrays.xml @@ -493,10 +493,6 @@ @@ -1127,7 +1127,7 @@ index 305b0721a5..fb593d99db 100644 "Jo" "Po" diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml -index 5a3c3407d9..5f40eba5e9 100644 +index 5a3c3407d9e..5f40eba5e91 100644 --- a/res/values-sr/arrays.xml +++ b/res/values-sr/arrays.xml @@ -493,10 +493,6 @@ @@ -1142,7 +1142,7 @@ index 5a3c3407d9..5f40eba5e9 100644 "Не" "Да" diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml -index ef7ebca8eb..c756bb30a9 100644 +index ef7ebca8eb5..c756bb30a9a 100644 --- a/res/values-sv/arrays.xml +++ b/res/values-sv/arrays.xml @@ -493,10 +493,6 @@ @@ -1157,7 +1157,7 @@ index ef7ebca8eb..c756bb30a9 100644 "Nej" "Ja" diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml -index 53006c7a29..830990134e 100644 +index 53006c7a29e..830990134e1 100644 --- a/res/values-sw/arrays.xml +++ b/res/values-sw/arrays.xml @@ -493,10 +493,6 @@ @@ -1172,7 +1172,7 @@ index 53006c7a29..830990134e 100644 "Hapana" "Ndiyo" diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml -index 737d835e6f..a9da4b013b 100644 +index 737d835e6f1..a9da4b013b5 100644 --- a/res/values-ta/arrays.xml +++ b/res/values-ta/arrays.xml @@ -493,10 +493,6 @@ @@ -1187,7 +1187,7 @@ index 737d835e6f..a9da4b013b 100644 "வேண்டாம்" "ஆம்" diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml -index a9a21fc689..340cf6ae48 100644 +index a9a21fc6890..340cf6ae486 100644 --- a/res/values-te/arrays.xml +++ b/res/values-te/arrays.xml @@ -493,10 +493,6 @@ @@ -1202,7 +1202,7 @@ index a9a21fc689..340cf6ae48 100644 "లేదు" "అవును" diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml -index d035f21ffe..9167a9c78a 100644 +index d035f21ffec..9167a9c78a5 100644 --- a/res/values-th/arrays.xml +++ b/res/values-th/arrays.xml @@ -493,10 +493,6 @@ @@ -1217,7 +1217,7 @@ index d035f21ffe..9167a9c78a 100644 "ไม่" "ใช่" diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml -index a8cef12dcd..56a50606e6 100644 +index a8cef12dcd6..56a50606e63 100644 --- a/res/values-tl/arrays.xml +++ b/res/values-tl/arrays.xml @@ -493,10 +493,6 @@ @@ -1232,7 +1232,7 @@ index a8cef12dcd..56a50606e6 100644 "Hindi" "Oo" diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml -index e193a59ed7..062c1c652b 100644 +index e193a59ed7f..062c1c652b7 100644 --- a/res/values-tr/arrays.xml +++ b/res/values-tr/arrays.xml @@ -493,10 +493,6 @@ @@ -1247,7 +1247,7 @@ index e193a59ed7..062c1c652b 100644 "Hayır" "Evet" diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml -index 04f31d6940..6be0cbc325 100644 +index 04f31d69402..6be0cbc325f 100644 --- a/res/values-uk/arrays.xml +++ b/res/values-uk/arrays.xml @@ -493,10 +493,6 @@ @@ -1262,7 +1262,7 @@ index 04f31d6940..6be0cbc325 100644 "Ні" "Так" diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml -index cee2d51999..6e5eaea6ad 100644 +index cee2d519994..6e5eaea6adc 100644 --- a/res/values-ur/arrays.xml +++ b/res/values-ur/arrays.xml @@ -493,10 +493,6 @@ @@ -1277,7 +1277,7 @@ index cee2d51999..6e5eaea6ad 100644 "نہیں" "ہاں" diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml -index e05793840b..5cd865a6a0 100644 +index e05793840b0..5cd865a6a08 100644 --- a/res/values-uz/arrays.xml +++ b/res/values-uz/arrays.xml @@ -493,10 +493,6 @@ @@ -1292,7 +1292,7 @@ index e05793840b..5cd865a6a0 100644 "Yo‘q" "Ha" diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml -index 0895ab8ef7..eaf3d4b773 100644 +index 0895ab8ef75..eaf3d4b773f 100644 --- a/res/values-vi/arrays.xml +++ b/res/values-vi/arrays.xml @@ -493,10 +493,6 @@ @@ -1307,7 +1307,7 @@ index 0895ab8ef7..eaf3d4b773 100644 "Không" "Có" diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml -index bb96438c03..3a04873c2d 100644 +index bb96438c03a..3a04873c2de 100644 --- a/res/values-zh-rCN/arrays.xml +++ b/res/values-zh-rCN/arrays.xml @@ -493,10 +493,6 @@ @@ -1322,7 +1322,7 @@ index bb96438c03..3a04873c2d 100644 "否" "是" diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml -index c4ed3db89b..b436bf9e4a 100644 +index c4ed3db89b1..b436bf9e4ac 100644 --- a/res/values-zh-rHK/arrays.xml +++ b/res/values-zh-rHK/arrays.xml @@ -493,10 +493,6 @@ @@ -1337,7 +1337,7 @@ index c4ed3db89b..b436bf9e4a 100644 "否" "是" diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml -index ecfa5e6629..d5b9f71ebe 100644 +index ecfa5e66292..d5b9f71ebe6 100644 --- a/res/values-zh-rTW/arrays.xml +++ b/res/values-zh-rTW/arrays.xml @@ -493,10 +493,6 @@ @@ -1352,7 +1352,7 @@ index ecfa5e6629..d5b9f71ebe 100644 "否" "是" diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml -index 81a602b4fb..c2d2bf1298 100644 +index 81a602b4fbc..c2d2bf1298e 100644 --- a/res/values-zu/arrays.xml +++ b/res/values-zu/arrays.xml @@ -493,10 +493,6 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch index 1247258b..bcacd508 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch @@ -16,7 +16,7 @@ Change-Id: Ic01a142722372d9d57f52947025cd9db23e58ef4 create mode 100644 src/com/android/settings/security/HostsPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index d723977899..5af3638555 100644 +index d723977899f..5af3638555a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11969,6 +11969,9 @@ @@ -30,7 +30,7 @@ index d723977899..5af3638555 100644 Privacy diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml -index 75cc0b261d..62d42246a3 100644 +index 75cc0b261d3..62d42246a3d 100644 --- a/res/xml/security_dashboard_settings.xml +++ b/res/xml/security_dashboard_settings.xml @@ -75,6 +75,12 @@ @@ -48,7 +48,7 @@ index 75cc0b261d..62d42246a3 100644 diff --git a/src/com/android/settings/security/HostsPreferenceController.java b/src/com/android/settings/security/HostsPreferenceController.java new file mode 100644 -index 0000000000..d8af6d2649 +index 00000000000..d8af6d26490 --- /dev/null +++ b/src/com/android/settings/security/HostsPreferenceController.java @@ -0,0 +1,106 @@ @@ -159,7 +159,7 @@ index 0000000000..d8af6d2649 + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 387814c406..0fbcd27104 100644 +index 387814c406b..0fbcd27104d 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -121,6 +121,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch index 7d0be244..eace20e2 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch @@ -11,7 +11,7 @@ Subject: [PATCH] add LTE only setting 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index 79e036a04c..5907f3a52e 100644 +index 79e036a04cb..5907f3a52e5 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1423,6 +1423,9 @@ @@ -34,7 +34,7 @@ index 79e036a04c..5907f3a52e 100644 TDSCDMA only TDSCDMA/WCDMA diff --git a/res/values/strings.xml b/res/values/strings.xml -index 5af3638555..50803304ac 100644 +index 5af3638555a..50803304ac2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11593,6 +11593,8 @@ @@ -60,7 +60,7 @@ index 5af3638555..50803304ac 100644 3G diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java -index fd585a151d..29111b89ec 100644 +index fd585a151d2..29111b89ec2 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -235,6 +235,7 @@ public class EnabledNetworkModePreferenceController extends @@ -163,7 +163,7 @@ index fd585a151d..29111b89ec 100644 * Add LTE entry. If device supported 5G, show "LTE" instead of "LTE (recommended)". */ diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java -index ff6ff596fe..2b9bc3e485 100644 +index ff6ff596fe9..2b9bc3e485c 100644 --- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java @@ -136,7 +136,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-2.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-2.patch index a0867cb0..9c31882f 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-2.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-2.patch @@ -12,7 +12,7 @@ https://developer.android.com/reference/android/telephony/CarrierConfigManager#K 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java -index 29111b89ec..8cc81b84b0 100644 +index 29111b89ec2..8cc81b84b01 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -76,7 +76,7 @@ public class EnabledNetworkModePreferenceController extends diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-3.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-3.patch index f97d5874..963f1215 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-3.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-3.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Add LTE only entry when carrier enables world mode. 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java -index 8cc81b84b0..8bad6daf2b 100644 +index 8cc81b84b01..8bad6daf2b2 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -360,6 +360,7 @@ public class EnabledNetworkModePreferenceController extends diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch index b888d4ad..75c69208 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch @@ -11,7 +11,7 @@ Subject: [PATCH] add a toggle for forcibly disabling SUPL create mode 100644 src/com/android/settings/location/ForceDisableSuplPrefController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 50803304ac..c597570f35 100644 +index 50803304ac2..c597570f35d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12297,4 +12297,7 @@ @@ -23,7 +23,7 @@ index 50803304ac..c597570f35 100644 + Always disable SUPL assisted location support regardless of carrier configuration or emergency call status (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL) diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml -index fb03f4c7f3..a66df8fea6 100644 +index fb03f4c7f3d..a66df8fea66 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -77,6 +77,12 @@ @@ -41,7 +41,7 @@ index fb03f4c7f3..a66df8fea6 100644 create mode 100644 src/com/android/settings/security/SigSpoofPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index c597570f35..3d2b61cc58 100644 +index c597570f35d..3d2b61cc580 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11978,6 +11978,9 @@ @@ -30,7 +30,7 @@ index c597570f35..3d2b61cc58 100644 Privacy diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml -index 62d42246a3..21ce054889 100644 +index 62d42246a3d..21ce054889c 100644 --- a/res/xml/security_dashboard_settings.xml +++ b/res/xml/security_dashboard_settings.xml @@ -81,6 +81,12 @@ @@ -47,7 +47,7 @@ index 62d42246a3..21ce054889 100644 diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 0fbcd27104..5248d74c37 100644 +index 0fbcd27104d..5248d74c376 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -122,6 +122,7 @@ public class SecuritySettings extends DashboardFragment { @@ -60,7 +60,7 @@ index 0fbcd27104..5248d74c37 100644 controllers.addAll(securityPreferenceControllers); diff --git a/src/com/android/settings/security/SigSpoofPreferenceController.java b/src/com/android/settings/security/SigSpoofPreferenceController.java new file mode 100644 -index 0000000000..258b59b0b0 +index 00000000000..258b59b0b07 --- /dev/null +++ b/src/com/android/settings/security/SigSpoofPreferenceController.java @@ -0,0 +1,106 @@ diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch index 0985be5d..0f0cbeff 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch @@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index 77a6e9d6b658..372914a67827 100644 +index 884770bc5f3c..babf76e867c9 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -4510,12 +4510,7 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -4526,12 +4526,7 @@ public class ActivityManagerService extends IActivityManager.Stub ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr); diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0033-minimal_screenshot_exif.patch b/Patches/LineageOS-19.1/android_frameworks_base/0033-minimal_screenshot_exif.patch index 4fa9b591..63c126ea 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0033-minimal_screenshot_exif.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0033-minimal_screenshot_exif.patch @@ -1,4 +1,4 @@ -From 546fd13c6f1d99cb36ca8db80da2d66b96329f47 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 26 Sep 2023 19:30:58 +0530 Subject: [PATCH] Put bare minimum metadata in screenshots @@ -12,10 +12,10 @@ Change-Id: I6f38c5cf04539e09b8bfe0102c646bd8faa50f5b 1 file changed, 11 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java -index 7cfe2327f992..b991fccf0e84 100644 +index dcd22958c54a..3888c519f078 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java -@@ -394,19 +394,8 @@ public class ImageExporter { +@@ -408,19 +408,8 @@ class ImageExporter { static void updateExifAttributes(ExifInterface exif, UUID uniqueId, int width, int height, ZonedDateTime captureTime) { @@ -35,6 +35,3 @@ index 7cfe2327f992..b991fccf0e84 100644 } static String getMimeType(CompressFormat format) { --- -GitLab - diff --git a/Patches/LineageOS-19.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch b/Patches/LineageOS-19.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch index d2ecad39..dda7f3be 100644 --- a/Patches/LineageOS-19.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch +++ b/Patches/LineageOS-19.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch @@ -31,7 +31,7 @@ Change-Id: I5926493864d4b1291ae83f8b601bf5dcc54085cd create mode 100644 hosts_cache.h diff --git a/Android.bp b/Android.bp -index 696d721..86c9cf9 100644 +index b46aeff..aba4438 100644 --- a/Android.bp +++ b/Android.bp @@ -164,6 +164,7 @@ cc_library { diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 2946d65a..8d3236ad 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -123,6 +123,7 @@ patchWorkspaceReal() { repopick -fit msm8974-gps-r; repopick -fit hh-vsync; repopick -fi 311299; #ble: Workaround malformed HCI_BLE_VENDOR_CAP response + repopick -it R_asb_2023-11; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 72b95c53..880a085f 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -123,6 +123,11 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.pa fi; fi; +if enterAndClear "external/libcups"; then +git fetch https://github.com/LineageOS/android_external_libcups refs/changes/46/373946/1 && git cherry-pick FETCH_HEAD; #R_asb_2023-11 +git fetch https://github.com/LineageOS/android_external_libcups refs/changes/47/373947/1 && git cherry-pick FETCH_HEAD; +fi; + if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index b16c7438..1831baca 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -66,9 +66,10 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -it twelve-colors; + repopick -it S_asb_2023-11; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index b619a0a6..16f320a6 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -177,7 +177,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Allow_Disabling_NTP.patch" applyPatch "$DOS_PATCHES/android_frameworks_base/0030-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS) if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0031-Unprivileged_microG_Handling.patch"; fi; #Unprivileged microG handling (heavily based off of a CalyxOS patch) applyPatch "$DOS_PATCHES/android_frameworks_base/0032-tile_restrictions.patch"; #SystemUI: Require unlocking to use sensitive QS tiles (GrapheneOS) -applyPatch "$DOS_PATCHES/android_frameworks_base/0042-minimal_screenshot_exif.patch"; #Put bare minimum metadata in screenshots (CalyxOS) +applyPatch "$DOS_PATCHES/android_frameworks_base/0033-minimal_screenshot_exif.patch"; #Put bare minimum metadata in screenshots (CalyxOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider (GrapheneOS) hardenLocationConf services/core/java/com/android/server/location/gnss/gps_debug.conf; #Harden the default GPS config @@ -349,6 +349,7 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Connectivity/0002-Private_DNS. fi; if enterAndClear "packages/modules/DnsResolver"; then +git fetch https://github.com/LineageOS/android_packages_modules_DnsResolver refs/changes/09/373909/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-11 applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch"; #DnsResolver: Sort and cache hosts file data for fast lookup (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch"; #DnsResolver: Support wildcards in cached hosts file (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0002-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS) @@ -372,6 +373,10 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0005-Browser_No_Loc applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0006-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS) fi; +if enterAndClear "packages/modules/StatsD"; then +git fetch https://github.com/LineageOS/android_packages_modules_StatsD refs/changes/10/373910/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-11 +fi; + if enterAndClear "packages/modules/Wifi"; then applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS) applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/0001-Random_MAC-a1.patch"; #Fix MAC address leak after SSR (AOSP) diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index d1c82d8d..4e4d5a69 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -161,7 +161,6 @@ patchWorkspaceReal() { source build/envsetup.sh; repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps - repopick -it T_asb_2023-11 -e 373323; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index cab4be2f..cc2ca25b 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -369,7 +369,6 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Connectivity/0001-Network_Perm fi; if enterAndClear "packages/modules/DnsResolver"; then -git fetch https://github.com/LineageOS/android_packages_modules_DnsResolver refs/changes/20/373320/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-11 applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch"; #DnsResolver: Sort and cache hosts file data for fast lookup (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch"; #DnsResolver: Support wildcards in cached hosts file (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0002-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS) @@ -388,10 +387,6 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0005-Browser_No_Loc applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0006-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS) fi; -if enterAndClear "packages/modules/StatsD"; then -git fetch https://github.com/LineageOS/android_packages_modules_StatsD refs/changes/21/373321/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-11 -fi; - if enterAndClear "packages/modules/Wifi"; then applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/344228.patch"; #wifi: resurrect mWifiLinkLayerStatsSupported counter (sassmann) applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)