diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0019-Random_MAC.patch b/Patches/LineageOS-17.1/android_frameworks_base/0019-Random_MAC.patch new file mode 100644 index 00000000..68a87c64 --- /dev/null +++ b/Patches/LineageOS-17.1/android_frameworks_base/0019-Random_MAC.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Renlord +Date: Fri, 13 Dec 2019 22:44:39 +1100 +Subject: [PATCH] add option of always randomizing MAC addresses + +--- + wifi/java/android/net/wifi/WifiConfiguration.java | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java +index 88f2bb2ad6e8..24a9b043b75c 100644 +--- a/wifi/java/android/net/wifi/WifiConfiguration.java ++++ b/wifi/java/android/net/wifi/WifiConfiguration.java +@@ -1015,12 +1015,17 @@ public class WifiConfiguration implements Parcelable { + * Generate a randomized MAC once and reuse it for all connections to this network + */ + public static final int RANDOMIZATION_PERSISTENT = 1; ++ /** ++ * @hide ++ * Generate a randomize MAC always ++ */ ++ public static final int RANDOMIZATION_ALWAYS = 100; + + /** + * @hide + * Level of MAC randomization for this network + */ +- public int macRandomizationSetting = RANDOMIZATION_PERSISTENT; ++ public int macRandomizationSetting = RANDOMIZATION_ALWAYS; + + /** + * @hide diff --git a/Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/0002-Random_MAC.patch b/Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/0002-Random_MAC.patch new file mode 100644 index 00000000..357e8dc3 --- /dev/null +++ b/Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/0002-Random_MAC.patch @@ -0,0 +1,105 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Renlord +Date: Sat, 21 Dec 2019 00:33:56 +1100 +Subject: [PATCH] add support for always generating new random MAC + +To trigger re-generation of randomized MAC addressed for an already +connected AP. User simply has to toggle on/off wifi. Otherwise, on +re-connection, a new randomized MAC address also gets generated. +--- + .../java/com/android/server/wifi/ClientModeImpl.java | 9 +++++++-- + .../com/android/server/wifi/WifiConfigManager.java | 10 ++++++++-- + .../com/android/server/wifi/WifiConfigurationUtil.java | 2 +- + service/java/com/android/server/wifi/WifiMetrics.java | 4 ++-- + 4 files changed, 18 insertions(+), 7 deletions(-) + +diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java +index d91b7f8b8..befc92fb4 100644 +--- a/service/java/com/android/server/wifi/ClientModeImpl.java ++++ b/service/java/com/android/server/wifi/ClientModeImpl.java +@@ -3407,7 +3407,12 @@ public class ClientModeImpl extends StateMachine { + String currentMacString = mWifiNative.getMacAddress(mInterfaceName); + MacAddress currentMac = currentMacString == null ? null : + MacAddress.fromString(currentMacString); +- MacAddress newMac = config.getOrCreateRandomizedMacAddress(); ++ MacAddress newMac; ++ if (config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ newMac = config.getOrCreateRandomizedMacAddress(); ++ } else { ++ newMac = MacAddress.createRandomUnicastAddress(); ++ } + mWifiConfigManager.setNetworkRandomizedMacAddress(config.networkId, newMac); + if (!WifiConfiguration.isValidMacAddressForRandomization(newMac)) { + Log.wtf(TAG, "Config generated an invalid MAC address"); +@@ -4310,7 +4315,7 @@ public class ClientModeImpl extends StateMachine { + reportConnectionAttemptStart(config, mTargetRoamBSSID, + WifiMetricsProto.ConnectionEvent.ROAM_UNRELATED); + if (config.macRandomizationSetting +- == WifiConfiguration.RANDOMIZATION_PERSISTENT ++ != WifiConfiguration.RANDOMIZATION_NONE + && mConnectedMacRandomzationSupported) { + configureRandomizedMacAddress(config); + } else { +diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java +index 393a5c395..cb44fb4ab 100644 +--- a/service/java/com/android/server/wifi/WifiConfigManager.java ++++ b/service/java/com/android/server/wifi/WifiConfigManager.java +@@ -1113,7 +1113,13 @@ public class WifiConfigManager { + packageName != null ? packageName : mContext.getPackageManager().getNameForUid(uid); + newInternalConfig.creationTime = newInternalConfig.updateTime = + createDebugTimeStampString(mClock.getWallClockMillis()); +- MacAddress randomizedMac = getPersistentMacAddress(newInternalConfig); ++ ++ MacAddress randomizedMac; ++ if (externalConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ randomizedMac = getPersistentMacAddress(newInternalConfig); ++ } else { ++ randomizedMac = MacAddress.createRandomUnicastAddress(); ++ } + if (randomizedMac != null) { + newInternalConfig.setRandomizedMacAddress(randomizedMac); + } +@@ -1533,7 +1539,7 @@ public class WifiConfigManager { + public boolean isInFlakyRandomizationSsidHotlist(int networkId) { + WifiConfiguration config = getConfiguredNetwork(networkId); + return config != null +- && config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT ++ && config.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_NONE + && mRandomizationFlakySsidHotlist.contains(config.SSID); + } + +diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java +index b8992a011..f47f42d1b 100644 +--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java ++++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java +@@ -242,7 +242,7 @@ public class WifiConfigurationUtil { + public static boolean hasMacRandomizationSettingsChanged(WifiConfiguration existingConfig, + WifiConfiguration newConfig) { + if (existingConfig == null) { +- return newConfig.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ return newConfig.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_ALWAYS; + } + return newConfig.macRandomizationSetting != existingConfig.macRandomizationSetting; + } +diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java +index 6db4e9955..5ea824ee3 100644 +--- a/service/java/com/android/server/wifi/WifiMetrics.java ++++ b/service/java/com/android/server/wifi/WifiMetrics.java +@@ -1115,7 +1115,7 @@ public class WifiMetrics { + if (config != null) { + mCurrentConnectionEvent.mConnectionEvent.useRandomizedMac = + config.macRandomizationSetting +- == WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ != WifiConfiguration.RANDOMIZATION_NONE; + mCurrentConnectionEvent.mConnectionEvent.connectionNominator = + mNetworkIdToNominatorId.get(config.networkId, + WifiMetricsProto.ConnectionEvent.NOMINATOR_UNKNOWN); +@@ -3037,7 +3037,7 @@ public class WifiMetrics { + if (config.isPasspoint()) { + mWifiLogProto.numPasspointNetworks++; + } +- if (config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ if (config.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_NONE) { + mWifiLogProto.numSavedNetworksWithMacRandomization++; + } + } diff --git a/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-1.patch b/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-1.patch new file mode 100644 index 00000000..82b641c6 --- /dev/null +++ b/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-1.patch @@ -0,0 +1,106 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Renlord +Date: Sun, 8 Dec 2019 23:58:24 +0100 +Subject: [PATCH] add option to always randomize MAC + +RANDOMIZATION_ALWAYS is set as the default option +--- + res/values/arrays.xml | 4 ++- + .../WifiDetailPreferenceController.java | 3 +- + .../WifiPrivacyPreferenceController.java | 31 ++++++++++++++----- + 3 files changed, 29 insertions(+), 9 deletions(-) + +diff --git a/res/values/arrays.xml b/res/values/arrays.xml +index b983f467df..e1e7581deb 100644 +--- a/res/values/arrays.xml ++++ b/res/values/arrays.xml +@@ -1120,7 +1120,8 @@ + + + +- Use randomized MAC (default) ++ Use fully randomized MAC (default) ++ Use per-network randomized MAC + Use device MAC + + +@@ -1136,6 +1137,7 @@ + + + ++ 100 + 1 + 0 + +diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +index afcf883fb6..ce45108f22 100644 +--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java ++++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +@@ -700,7 +700,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController + + // return randomized MAC address + if (mWifiConfig != null && +- mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ (mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT ++ || mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_ALWAYS)) { + return mWifiConfig.getRandomizedMacAddress().toString(); + } + +diff --git a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java +index 950cc131f4..1ed9646a7f 100644 +--- a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java ++++ b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java +@@ -112,11 +112,12 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im + if (mWifiConfiguration != null) { + return mWifiConfiguration.macRandomizationSetting; + } +- return WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; + } + +- private static final int PREF_RANDOMIZATION_PERSISTENT = 0; +- private static final int PREF_RANDOMIZATION_NONE = 1; ++ private static final int PREF_RANDOMIZATION_ALWAYS = 0; ++ private static final int PREF_RANDOMIZATION_PERSISTENT = 1; ++ private static final int PREF_RANDOMIZATION_NONE = 2; + + /** + * Returns preference index value. +@@ -125,8 +126,16 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im + * @return index value of preference + */ + public static int translateMacRandomizedValueToPrefValue(int macRandomized) { +- return (macRandomized == WifiConfiguration.RANDOMIZATION_PERSISTENT) +- ? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE; ++ switch (macRandomized) { ++ case WifiConfiguration.RANDOMIZATION_ALWAYS: ++ return PREF_RANDOMIZATION_ALWAYS; ++ case WifiConfiguration.RANDOMIZATION_PERSISTENT: ++ return PREF_RANDOMIZATION_PERSISTENT; ++ case WifiConfiguration.RANDOMIZATION_NONE: ++ return PREF_RANDOMIZATION_NONE; ++ default: ++ return PREF_RANDOMIZATION_ALWAYS; ++ } + } + + /** +@@ -136,8 +145,16 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im + * @return mac randomized value + */ + public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) { +- return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT) +- ? WifiConfiguration.RANDOMIZATION_PERSISTENT : WifiConfiguration.RANDOMIZATION_NONE; ++ switch (prefMacRandomized) { ++ case PREF_RANDOMIZATION_ALWAYS: ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ case PREF_RANDOMIZATION_PERSISTENT: ++ return WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ case PREF_RANDOMIZATION_NONE: ++ return WifiConfiguration.RANDOMIZATION_NONE; ++ default: ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ } + } + + private void updateSummary(DropDownPreference preference, int macRandomized) { diff --git a/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-2.patch b/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-2.patch new file mode 100644 index 00000000..09eb5897 --- /dev/null +++ b/Patches/LineageOS-17.1/android_packages_apps_Settings/0010-Random_MAC-2.patch @@ -0,0 +1,1368 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Daniel Micay +Date: Mon, 2 Mar 2020 15:35:54 -0500 +Subject: [PATCH] removed all translations for wifi MAC privacy setting + +--- + res/values-af/arrays.xml | 4 ---- + res/values-am/arrays.xml | 4 ---- + res/values-ar/arrays.xml | 4 ---- + res/values-as/arrays.xml | 4 ---- + res/values-az/arrays.xml | 4 ---- + res/values-b+sr+Latn/arrays.xml | 4 ---- + res/values-be/arrays.xml | 4 ---- + res/values-bg/arrays.xml | 4 ---- + res/values-bn/arrays.xml | 4 ---- + res/values-bs/arrays.xml | 4 ---- + res/values-ca/arrays.xml | 4 ---- + res/values-cs/arrays.xml | 4 ---- + res/values-da/arrays.xml | 4 ---- + res/values-de/arrays.xml | 4 ---- + res/values-el/arrays.xml | 4 ---- + res/values-en-rAU/arrays.xml | 4 ---- + res/values-en-rCA/arrays.xml | 4 ---- + res/values-en-rGB/arrays.xml | 4 ---- + res/values-en-rIN/arrays.xml | 4 ---- + res/values-en-rXC/arrays.xml | 4 ---- + res/values-es-rUS/arrays.xml | 4 ---- + res/values-es/arrays.xml | 4 ---- + res/values-et/arrays.xml | 4 ---- + res/values-eu/arrays.xml | 4 ---- + res/values-fa/arrays.xml | 4 ---- + res/values-fi/arrays.xml | 4 ---- + res/values-fr-rCA/arrays.xml | 4 ---- + res/values-fr/arrays.xml | 4 ---- + res/values-gl/arrays.xml | 4 ---- + res/values-gu/arrays.xml | 4 ---- + res/values-hi/arrays.xml | 4 ---- + res/values-hr/arrays.xml | 4 ---- + res/values-hu/arrays.xml | 4 ---- + res/values-hy/arrays.xml | 4 ---- + res/values-in/arrays.xml | 4 ---- + res/values-is/arrays.xml | 4 ---- + res/values-it/arrays.xml | 4 ---- + res/values-iw/arrays.xml | 4 ---- + res/values-ja/arrays.xml | 4 ---- + res/values-ka/arrays.xml | 4 ---- + res/values-kk/arrays.xml | 4 ---- + res/values-km/arrays.xml | 4 ---- + res/values-kn/arrays.xml | 4 ---- + res/values-ko/arrays.xml | 4 ---- + res/values-ky/arrays.xml | 4 ---- + res/values-lo/arrays.xml | 4 ---- + res/values-lt/arrays.xml | 4 ---- + res/values-lv/arrays.xml | 4 ---- + res/values-mk/arrays.xml | 4 ---- + res/values-ml/arrays.xml | 4 ---- + res/values-mn/arrays.xml | 4 ---- + res/values-mr/arrays.xml | 4 ---- + res/values-ms/arrays.xml | 4 ---- + res/values-my/arrays.xml | 4 ---- + res/values-nb/arrays.xml | 4 ---- + res/values-ne/arrays.xml | 4 ---- + res/values-nl/arrays.xml | 4 ---- + res/values-or/arrays.xml | 4 ---- + res/values-pa/arrays.xml | 4 ---- + res/values-pl/arrays.xml | 4 ---- + res/values-pt-rBR/arrays.xml | 4 ---- + res/values-pt-rPT/arrays.xml | 4 ---- + res/values-pt/arrays.xml | 4 ---- + res/values-ro/arrays.xml | 4 ---- + res/values-ru/arrays.xml | 4 ---- + res/values-si/arrays.xml | 4 ---- + res/values-sk/arrays.xml | 4 ---- + res/values-sl/arrays.xml | 4 ---- + res/values-sq/arrays.xml | 4 ---- + res/values-sr/arrays.xml | 4 ---- + res/values-sv/arrays.xml | 4 ---- + res/values-sw/arrays.xml | 4 ---- + res/values-ta/arrays.xml | 4 ---- + res/values-te/arrays.xml | 4 ---- + res/values-th/arrays.xml | 4 ---- + res/values-tl/arrays.xml | 4 ---- + res/values-tr/arrays.xml | 4 ---- + res/values-uk/arrays.xml | 4 ---- + res/values-ur/arrays.xml | 4 ---- + res/values-uz/arrays.xml | 4 ---- + res/values-vi/arrays.xml | 4 ---- + res/values-zh-rCN/arrays.xml | 4 ---- + res/values-zh-rHK/arrays.xml | 4 ---- + res/values-zh-rTW/arrays.xml | 4 ---- + res/values-zu/arrays.xml | 4 ---- + 85 files changed, 340 deletions(-) + +diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml +index c8b0d47563..1ab2da3cc3 100644 +--- a/res/values-af/arrays.xml ++++ b/res/values-af/arrays.xml +@@ -475,10 +475,6 @@ + "Hanteer as beperk" + "Hanteer as onbeperk" + +- +- "Gebruik ewekansige MAC (verstek)" +- "Gebruik toestel-MAC" +- + + "Nee" + "Ja" +diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml +index 722b48c403..a89588e031 100644 +--- a/res/values-am/arrays.xml ++++ b/res/values-am/arrays.xml +@@ -475,10 +475,6 @@ + "እንደ ተለካ አስተናግድ" + "እንደ ያልተለካ አስተናግድ" + +- +- "የዘፈቀደ ማክ ይጠቀሙ (ነባሪ)" +- "የመሣሪያ ማክ ይጠቀሙ" +- + + "አይ" + "አዎ" +diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml +index f6e693ff1c..97c0a846f2 100644 +--- a/res/values-ar/arrays.xml ++++ b/res/values-ar/arrays.xml +@@ -475,10 +475,6 @@ + "معاملة الشبكة باعتبارها تفرض تكلفة استخدام" + "معاملة الشبكة باعتبارها لا تفرض تكلفة استخدام" + +- +- "‏استخدام عنوان MAC عشوائي (الإعداد التلقائي)" +- "‏استخدام عنوان MAC للجهاز" +- + + "لا" + "نعم" +diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml +index 07c7b3d6f6..7f17397335 100644 +--- a/res/values-as/arrays.xml ++++ b/res/values-as/arrays.xml +@@ -475,10 +475,6 @@ + "মিটাৰ কৰা হিছাপে আচৰণ কৰক" + "নিৰিখ অনিৰ্দিষ্ট বুলি গণ্য কৰক" + +- +- "যাদৃচ্ছিক MAC ব্যৱহাৰ কৰক (ডিফ’ল্ট)" +- "ডিভাইচৰ MAC ব্যৱহাৰ কৰক" +- + + "নহয়" + "হয়" +diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml +index 1e8758f029..fb99ada256 100644 +--- a/res/values-az/arrays.xml ++++ b/res/values-az/arrays.xml +@@ -475,10 +475,6 @@ + "Limitli olaraq qəbul edin" + "Limitisiz olaraq qəbul edin" + +- +- "İxtiyari MAC (defolt) istifadə edin" +- "MAC cihazından istifadə edin" +- + + "Xeyr" + "Bəli" +diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml +index b355390ac1..de326aec49 100644 +--- a/res/values-b+sr+Latn/arrays.xml ++++ b/res/values-b+sr+Latn/arrays.xml +@@ -475,10 +475,6 @@ + "Tretiraj kao mrežu sa ograničenjem" + "Tretiraj kao mrežu bez ograničenja" + +- +- "Koristi nasumično izabranu MAC adresu (podrazumevano)" +- "Koristi MAC adresu uređaja" +- + + "Ne" + "Da" +diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml +index e1038b94fd..b455b0ea48 100644 +--- a/res/values-be/arrays.xml ++++ b/res/values-be/arrays.xml +@@ -475,10 +475,6 @@ + "Лімітная" + "Безлімітная" + +- +- "Выкарыстоўваць выпадковы MAC-адрас (стандартна)" +- "Выкарыстоўваць MAC-адрас прылады" +- + + "Не" + "Так" +diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml +index f37eceaf6d..c651876a73 100644 +--- a/res/values-bg/arrays.xml ++++ b/res/values-bg/arrays.xml +@@ -475,10 +475,6 @@ + "Третиране като мрежа с отчитане" + "Третиране като мрежа без отчитане" + +- +- "Използване на произв. генериран MAC адрес (станд.)" +- "Използване на MAC адреса на устройството" +- + + "Не" + "Да" +diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml +index f14398a328..d4a3e68637 100644 +--- a/res/values-bn/arrays.xml ++++ b/res/values-bn/arrays.xml +@@ -475,10 +475,6 @@ + "মিটারিং চালু রাখুন" + "মিটারিং এর দরকার নেই" + +- +- "র‍্যান্ডমাইজ করা MAC (ডিফল্ট)" +- "ডিভাইসের MAC ব্যবহার করুন" +- + + "না" + "হ্যাঁ" +diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml +index 365473e269..52ecd63c5c 100644 +--- a/res/values-bs/arrays.xml ++++ b/res/values-bs/arrays.xml +@@ -475,10 +475,6 @@ + "Tretiraj kao vezu s naplatom" + "Tretiraj kao vezu bez naplate" + +- +- "Koristi nasumičnu MAC adresu (zadano)" +- "Koristi MAC adresu uređaja" +- + + "Ne" + "Da" +diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml +index 81e9f83fef..24b886f213 100644 +--- a/res/values-ca/arrays.xml ++++ b/res/values-ca/arrays.xml +@@ -475,10 +475,6 @@ + "Tracta com a xarxa d\'ús mesurat" + "Tracta com a xarxa d\'ús no mesurat" + +- +- "Utilitza adreça MAC aleatòria (predeterminat)" +- "Utilitza adreça MAC del dispositiu" +- + + "No" + "Sí" +diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml +index f44b947198..652f2bbf9c 100644 +--- a/res/values-cs/arrays.xml ++++ b/res/values-cs/arrays.xml +@@ -475,10 +475,6 @@ + "Považovat za měřenou síť" + "Považovat za neměřenou síť" + +- +- "Použít náhodně vygenerovanou adresu MAC" +- "Použít adresu MAC zařízení" +- + + "Ne" + "Ano" +diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml +index fd4e58d030..692ef9c8b4 100644 +--- a/res/values-da/arrays.xml ++++ b/res/values-da/arrays.xml +@@ -475,10 +475,6 @@ + "Håndter som forbrugsbaseret netværk" + "Håndter som ubegrænset netværk" + +- +- "Anvend tilfældig MAC (standard)" +- "Anvend enhedens MAC" +- + + "Nej" + "Ja" +diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml +index 886c9f68f4..3524eb9ccd 100644 +--- a/res/values-de/arrays.xml ++++ b/res/values-de/arrays.xml +@@ -475,10 +475,6 @@ + "Wie \"kostenpflichtig\" behandeln" + "Wie \"kostenlos\" behandeln" + +- +- "Zufällige MAC-Adresse verwenden (Standard)" +- "MAC-Adresse des Geräts verwenden" +- + + "Nein" + "Ja" +diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml +index 6b4a697877..d7cbe3f017 100644 +--- a/res/values-el/arrays.xml ++++ b/res/values-el/arrays.xml +@@ -475,10 +475,6 @@ + "Χρήση ως δικτύου με περιορισμούς" + "Χρήση ως δικτύου χωρίς περιορισμούς" + +- +- "Χρήση τυχαίου MAC (προεπιλογή)" +- "Χρήση MAC συσκευής" +- + + "Όχι" + "Ναι" +diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml +index 62498e8cbf..3684d540c4 100644 +--- a/res/values-en-rAU/arrays.xml ++++ b/res/values-en-rAU/arrays.xml +@@ -475,10 +475,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomised MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml +index 62498e8cbf..3684d540c4 100644 +--- a/res/values-en-rCA/arrays.xml ++++ b/res/values-en-rCA/arrays.xml +@@ -475,10 +475,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomised MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml +index 62498e8cbf..3684d540c4 100644 +--- a/res/values-en-rGB/arrays.xml ++++ b/res/values-en-rGB/arrays.xml +@@ -475,10 +475,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomised MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml +index 62498e8cbf..3684d540c4 100644 +--- a/res/values-en-rIN/arrays.xml ++++ b/res/values-en-rIN/arrays.xml +@@ -475,10 +475,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomised MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml +index 1faec9168a..3762c105b5 100644 +--- a/res/values-en-rXC/arrays.xml ++++ b/res/values-en-rXC/arrays.xml +@@ -475,10 +475,6 @@ + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎Treat as metered‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎Treat as unmetered‎‏‎‎‏‎" + +- +- "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎Use randomized MAC (default)‎‏‎‎‏‎" +- "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎Use device MAC‎‏‎‎‏‎" +- + + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎No‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎Yes‎‏‎‎‏‎" +diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml +index b5cee26ce1..8052f71290 100644 +--- a/res/values-es-rUS/arrays.xml ++++ b/res/values-es-rUS/arrays.xml +@@ -475,10 +475,6 @@ + "Tratar como red de uso medido" + "Tratar como red sin tarifa plana" + +- +- "Usar MAC aleatoria (predeterminada)" +- "Usar MAC del dispositivo" +- + + "No" + "Sí" +diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml +index d60f164a55..24021bc2f0 100644 +--- a/res/values-es/arrays.xml ++++ b/res/values-es/arrays.xml +@@ -475,10 +475,6 @@ + "Tratar como red de uso medido" + "Tratar como red de uso no medido" + +- +- "Usar dirección MAC aleatoria (predeterminado)" +- "Usar dirección MAC del dispositivo" +- + + "No" + "Sí" +diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml +index 0836f3a438..17e9768f60 100644 +--- a/res/values-et/arrays.xml ++++ b/res/values-et/arrays.xml +@@ -475,10 +475,6 @@ + "Käsitle mahupõhisena" + "Käsitle mittemahupõhisena" + +- +- "Kasuta juhuslikku MAC-aadressi (vaikeseade)" +- "Kasuta seadme MAC-aadressi" +- + + "Ei" + "Jah" +diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml +index 5924a7c5f7..628c00ffd8 100644 +--- a/res/values-eu/arrays.xml ++++ b/res/values-eu/arrays.xml +@@ -475,10 +475,6 @@ + "Tratatu sare neurtu gisa" + "Tratatu neurtu gabeko sare gisa" + +- +- "Erabili ausaz aukeratutako MAC helbidea (lehenetsia)" +- "Erabili gailuaren MAC helbidea" +- + + "Ez" + "Bai" +diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml +index a44cefd482..4e4e7f30c5 100644 +--- a/res/values-fa/arrays.xml ++++ b/res/values-fa/arrays.xml +@@ -475,10 +475,6 @@ + "محدودشده حساب شود" + "محدودنشده حساب شود" + +- +- "‏استفاده از MAC تصادفی (پیش‌فرض)" +- "‏استفاده از MAC دستگاه" +- + + "نه" + "بله" +diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml +index 98f0d4db0f..91728473d2 100644 +--- a/res/values-fi/arrays.xml ++++ b/res/values-fi/arrays.xml +@@ -475,10 +475,6 @@ + "Merkitse maksulliseksi" + "Merkitse maksuttomaksi" + +- +- "Käytä satunnaistettua MAC-osoitetta (oletus)" +- "Käytä laitteen MAC-osoitetta" +- + + "Ei" + "Kyllä" +diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml +index ea4cb2d274..36d8a77dfa 100644 +--- a/res/values-fr-rCA/arrays.xml ++++ b/res/values-fr-rCA/arrays.xml +@@ -475,10 +475,6 @@ + "Considérer comme facturé à l\'usage" + "Considérer comme non facturé à l\'usage" + +- +- "Utiliser une adresse MAC aléatoire (par défaut)" +- "Utiliser l\'adresse MAC de l\'appareil" +- + + "Non" + "Oui" +diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml +index 2673a8f532..7bfea30840 100644 +--- a/res/values-fr/arrays.xml ++++ b/res/values-fr/arrays.xml +@@ -475,10 +475,6 @@ + "Considérer comme facturé à l\'usage" + "Considérer comme non facturé à l\'usage" + +- +- "Utiliser adresse MAC aléatoire (par défaut)" +- "Utiliser adresse MAC de l\'appareil" +- + + "Non" + "Oui" +diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml +index eab6c49f03..5085226822 100644 +--- a/res/values-gl/arrays.xml ++++ b/res/values-gl/arrays.xml +@@ -475,10 +475,6 @@ + "Tratar como rede sen tarifa plana" + "Tratar como rede con tarifa plana" + +- +- "Usar MAC aleatorio (valor predeterminado)" +- "Usar dispositivo MAC" +- + + "Non" + "Si" +diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml +index ece9976bcf..51ea73284d 100644 +--- a/res/values-gu/arrays.xml ++++ b/res/values-gu/arrays.xml +@@ -475,10 +475,6 @@ + "મીટર કરેલ તરીકે ગણો" + "મીટર ન કરેલ તરીકે ગણો" + +- +- "રેન્ડમ કરેલ MACનો ઉપયોગ કરો (ડિફૉલ્ટ)" +- "MAC ડિવાઇસનો ઉપયોગ કરો" +- + + "ના" + "હા" +diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml +index b0b1aedaba..a3eb3167a9 100644 +--- a/res/values-hi/arrays.xml ++++ b/res/values-hi/arrays.xml +@@ -475,10 +475,6 @@ + "इस कनेक्शन में डेटा से जुड़ी पाबंदी है" + "इस कनेक्शन में डेटा से जुड़ी पाबंदी नहीं है" + +- +- "किसी भी MAC पते का इस्तेमाल करें (डिफ़ॉल्ट सेटिंग)" +- "डिवाइस MAC का इस्तेमाल करें" +- + + "नहीं" + "हां" +diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml +index 2a865b6e30..1fd6bd79c8 100644 +--- a/res/values-hr/arrays.xml ++++ b/res/values-hr/arrays.xml +@@ -475,10 +475,6 @@ + "Mreža s ograničenim prometom" + "Mreža bez ograničenja prometa" + +- +- "Koristi nasumično određen MAC (zadano)" +- "Upotrijebi MAC uređaja" +- + + "Ne" + "Da" +diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml +index 1cee4db941..fb7893d70e 100644 +--- a/res/values-hu/arrays.xml ++++ b/res/values-hu/arrays.xml +@@ -475,10 +475,6 @@ + "Kezelje forgalomkorlátosként" + "Kezelje nem forgalomkorlátosként" + +- +- "Véletlenszerű MAC-cím használata (alapértelmezett)" +- "Az eszköz MAC-címének használata" +- + + "Nem" + "Igen" +diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml +index a31975ca6b..8815456dec 100644 +--- a/res/values-hy/arrays.xml ++++ b/res/values-hy/arrays.xml +@@ -475,10 +475,6 @@ + "Սահմանափակ" + "Անսահմանափակ" + +- +- "Օգտագործել պատահական MAC հասցե (կանխադրված)" +- "Օգտագործել սարքի MAC հասցեն" +- + + "Ոչ" + "Այո" +diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml +index 5cad411615..a9a4803355 100644 +--- a/res/values-in/arrays.xml ++++ b/res/values-in/arrays.xml +@@ -475,10 +475,6 @@ + "Perlakukan sebagai berbayar" + "Perlakukan sebagai tidak berbayar" + +- +- "Gunakan MAC acak (default)" +- "Gunakan MAC perangkat" +- + + "Tidak" + "Ya" +diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml +index 135aee5854..07f5265219 100644 +--- a/res/values-is/arrays.xml ++++ b/res/values-is/arrays.xml +@@ -475,10 +475,6 @@ + "Meðhöndla sem mælt" + "Meðhöndla sem ótakmarkað" + +- +- "Nota MAC-vistfang af handahófi (sjálfgefið)" +- "Nota MAC-vistfang tækis" +- + + "Nei" + "Já" +diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml +index fa9f8a5c7e..43e0493159 100644 +--- a/res/values-it/arrays.xml ++++ b/res/values-it/arrays.xml +@@ -475,10 +475,6 @@ + "Considera a consumo" + "Considera non a consumo" + +- +- "Usa MAC casuale (predefinito)" +- "Usa MAC del dispositivo" +- + + "No" + "Sì" +diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml +index 6e699a5943..d5b6c1bb18 100644 +--- a/res/values-iw/arrays.xml ++++ b/res/values-iw/arrays.xml +@@ -475,10 +475,6 @@ + "יש להתייחס כרשת נמדדת" + "יש להתייחס כרשת לא נמדדת" + +- +- "‏שימוש ב-MAC אקראי (ברירת מחדל)" +- "‏שימוש ב-MAC של המכשיר" +- + + "לא" + "כן" +diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml +index ec6032a37b..0eed2ba98f 100644 +--- a/res/values-ja/arrays.xml ++++ b/res/values-ja/arrays.xml +@@ -475,10 +475,6 @@ + "従量制として処理" + "定額制として処理" + +- +- "ランダムな MAC を使用する（デフォルト）" +- "デバイスの MAC を使用する" +- + + "いいえ" + "はい" +diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml +index 5a5ddf40dc..26c952765c 100644 +--- a/res/values-ka/arrays.xml ++++ b/res/values-ka/arrays.xml +@@ -475,10 +475,6 @@ + "ლიმიტირებულად ჩათვლა" + "არალიმიტირებულად ჩათვლა" + +- +- "შემთხვევითი MAC-ის გამოყენება (ნაგულ.)" +- "მოწყობილობის MAC-მისამართის გამოყენება" +- + + "არა" + "დიახ" +diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml +index 296f53f2c0..17eb66ed83 100644 +--- a/res/values-kk/arrays.xml ++++ b/res/values-kk/arrays.xml +@@ -475,10 +475,6 @@ + "Трафик саналсын" + "Трафик саналмасын" + +- +- "Кездейсоқ MAC мекенжайын пайдалану (әдепкі)" +- "Құрылғының MAC мекенжайын пайдалану" +- + + "Жоқ" + "Иә" +diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml +index c8ccd75d46..0f3e9543e7 100644 +--- a/res/values-km/arrays.xml ++++ b/res/values-km/arrays.xml +@@ -475,10 +475,6 @@ + "ចាត់​ទុកថាមានការកំណត់" + "​ចាត់​ទុកថាមិនមាន​ការកំណត់ទេ" + +- +- "ប្រើ MAC ចៃដន្យ (លំនាំដើម)" +- "ប្រើ MAC ឧបករណ៍" +- + + "ទេ" + "បាទ/ចាស" +diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml +index 4cf184bc0e..84e36ff71f 100644 +--- a/res/values-kn/arrays.xml ++++ b/res/values-kn/arrays.xml +@@ -475,10 +475,6 @@ + "ಮೀಟರ್ ಮಾಡಿದೆ ಎಂದು ಪರಿಗಣಿಸಿ" + "ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸಿ" + +- +- "ಯಾದೃಚ್ಛಿಕವಾದ MAC (ಡೀಫಾಲ್ಟ್) ಅನ್ನು ಬಳಸಿ" +- "ಸಾಧನದ MAC ಬಳಸಿ" +- + + "ಇಲ್ಲ" + "ಹೌದು" +diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml +index ebaf3c0ba3..c4156fe1a4 100644 +--- a/res/values-ko/arrays.xml ++++ b/res/values-ko/arrays.xml +@@ -475,10 +475,6 @@ + "종량제 Wi-Fi로 취급" + "무제한 Wi-Fi로 취급" + +- +- "임의의 MAC 사용(기본값)" +- "기기 MAC 사용" +- + + "아니요" + "예" +diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml +index 165f2c6b33..17e8bae37e 100644 +--- a/res/values-ky/arrays.xml ++++ b/res/values-ky/arrays.xml +@@ -475,10 +475,6 @@ + "Ченелет" + "Ченелбейт" + +- +- "Туш келди MAC дарек колдонулат (демейки)" +- "MAC түзмөгүн колдонуу" +- + + "Жок" + "Ооба" +diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml +index 48d3bd9b83..f1373922b6 100644 +--- a/res/values-lo/arrays.xml ++++ b/res/values-lo/arrays.xml +@@ -475,10 +475,6 @@ + "ໃຊ້ແບບວັດແທກປະລິມານ" + "ໃຊ້ແບບບໍ່ວັດແທກປະລິມານ" + +- +- "ໃຊ້ MAC ແບບສຸ່ມ (ຄ່າເລີ່ມຕົ້ນ)" +- "ໃຊ້ MAC ອຸປະກອນ" +- + + "ບໍ່" + "ແມ່ນ" +diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml +index bf9dbe19a2..324451d99b 100644 +--- a/res/values-lt/arrays.xml ++++ b/res/values-lt/arrays.xml +@@ -475,10 +475,6 @@ + "Laikyti matuojamu" + "Laikyti nematuojamu" + +- +- "Naudoti atsitiktine tvarka parinktą MAC (numatyta)" +- "Naudoti įrenginio MAC" +- + + "Ne" + "Taip" +diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml +index 0463c08d65..c3c2cdd6a2 100644 +--- a/res/values-lv/arrays.xml ++++ b/res/values-lv/arrays.xml +@@ -475,10 +475,6 @@ + "Maksas" + "Bezmaksas" + +- +- "Izmantot nejaušā secībā atlasītu MAC adresi (noklusējums)" +- "Izmantot ierīces MAC adresi" +- + + "Nē" + "Jā" +diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml +index f4fb3d37d2..6614a5dd30 100644 +--- a/res/values-mk/arrays.xml ++++ b/res/values-mk/arrays.xml +@@ -475,10 +475,6 @@ + "Сметај како ограничена мрежа" + "Сметај како неограничена мрежа" + +- +- "Користи рандомизирана MAC-адреса (стандардно)" +- "Користи ја MAC-адресата на уредот" +- + + "Не" + "Да" +diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml +index 90f5e2de07..48bef28038 100644 +--- a/res/values-ml/arrays.xml ++++ b/res/values-ml/arrays.xml +@@ -475,10 +475,6 @@ + "മീറ്റർ-മാപകമായി കണക്കാക്കുക" + "മീറ്റർ മാപകമല്ലാത്തതായി കണക്കാക്കുക" + +- +- "ക്രമരഹിതമാക്കിയ MAC ഉപയോഗിക്കുക (ഡിഫോൾട്ട്)" +- "ഉപകരണ MAC വിലാസം ഉപയോഗിക്കൂ" +- + + "ഇല്ല" + "ഉവ്വ്" +diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml +index 0fc94feb47..29aa5258f9 100644 +--- a/res/values-mn/arrays.xml ++++ b/res/values-mn/arrays.xml +@@ -475,10 +475,6 @@ + "Хязгаартайгаар тохируулах" + "Хязгааргүйгээр тохируулах" + +- +- "Санамсаргүй үүссэн MAC-г ашиглах (өгөгдмөл)" +- "Төхөөрөмжийн MAC-г ашиглах" +- + + "Үгүй" + "Тийм" +diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml +index 19eed5bd5b..dfd860952c 100644 +--- a/res/values-mr/arrays.xml ++++ b/res/values-mr/arrays.xml +@@ -475,10 +475,6 @@ + "मर्यादित डेटा वापराचे नेटवर्क" + "अमर्याद डेटा वापराचे नेटवर्क" + +- +- "रँडमाइझ केलेले MAC वापरा (डीफॉल्ट)" +- "डिव्हाइस MAC वापरा" +- + + "नाही" + "होय" +diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml +index 7a61cb0473..e9db095279 100644 +--- a/res/values-ms/arrays.xml ++++ b/res/values-ms/arrays.xml +@@ -475,10 +475,6 @@ + "Anggap sebagai bermeter" + "Anggap sebagai tidak bermeter" + +- +- "Gunakan MAC terawak (lalai)" +- "Gunakan MAC peranti" +- + + "Tidak" + "Ya" +diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml +index 60eb09db46..0a48a4fdcf 100644 +--- a/res/values-my/arrays.xml ++++ b/res/values-my/arrays.xml +@@ -475,10 +475,6 @@ + "အခမဲ့ မဟုတ်သော အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်" + "အခမဲ့ အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်" + +- +- "ကျပန်း MAC ကို အသုံးပြုရန် (မူရင်း)" +- "ကိရိယာ၏ MAC သုံးရန်" +- + + "No" + "Yes" +diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml +index 73f2b60d75..0a848af8c2 100644 +--- a/res/values-nb/arrays.xml ++++ b/res/values-nb/arrays.xml +@@ -475,10 +475,6 @@ + "Behandle som med datamåling" + "Behandle som uten datamåling" + +- +- "Bruk tilfeldig valgt MAC-adresse (standard)" +- "Bruk enhetens MAC-adresse" +- + + "Nei" + "Ja" +diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml +index 3f4810694d..f7d966ac45 100644 +--- a/res/values-ne/arrays.xml ++++ b/res/values-ne/arrays.xml +@@ -475,10 +475,6 @@ + "सशुल्क वाइफाइका रूपमा लिनुहोस्" + "मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्" + +- +- "क्रमरहित MAC प्रयोग गर्नुहोस् (पूर्वनिर्धारित)" +- "यन्त्रको MAC प्रयोग गर्नुहोस्" +- + + "होइन" + "हो" +diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml +index ae3fbb3286..fc48746a6a 100644 +--- a/res/values-nl/arrays.xml ++++ b/res/values-nl/arrays.xml +@@ -475,10 +475,6 @@ + "Behandelen als wifi met datalimiet" + "Behandelen als wifi zonder datalimiet" + +- +- "Willekeurig MAC-adres gebruiken (standaard)" +- "MAC-adres van apparaat gebruiken" +- + + "Nee" + "Ja" +diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml +index cb53759887..11469a960e 100644 +--- a/res/values-or/arrays.xml ++++ b/res/values-or/arrays.xml +@@ -475,10 +475,6 @@ + "ମିଟର୍ ହୋଇଥିବା ରୂପେ ବିବେଚନା କରନ୍ତୁ" + "ମିଟର୍ ହୋଇନଥିବା ରୂପେ ବିବେଚନା କରନ୍ତୁ" + +- +- "ରେଣ୍ଡମାଇଜ୍ ହୋଇଥିବା MAC ବ୍ୟବହାର କରନ୍ତୁ (ଡିଫଲ୍ଟ)" +- "MAC ଡିଭାଇସ୍ ବ୍ୟବହାର କରନ୍ତୁ" +- + + "ନା" + "ହଁ" +diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml +index 9ab1d808bc..19a251fb80 100644 +--- a/res/values-pa/arrays.xml ++++ b/res/values-pa/arrays.xml +@@ -475,10 +475,6 @@ + "ਮੀਟਰਬੱਧ ਮੰਨੋ" + "ਗੈਰ-ਮੀਟਰਬੱਧ ਮੰਨੋ" + +- +- "ਬੇਤਰਤੀਬ MAC (ਪੂਰਵ-ਨਿਰਧਾਰਤ) ਵਰਤੋ" +- "ਡੀਵਾਈਸ MAC ਵਰਤੋ" +- + + "ਨਹੀਂ" + "ਹਾਂ" +diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml +index 1b0f899fcb..ca2b43b031 100644 +--- a/res/values-pl/arrays.xml ++++ b/res/values-pl/arrays.xml +@@ -475,10 +475,6 @@ + "Traktuj jako sieć z pomiarem użycia danych" + "Traktuj jako sieć bez pomiaru użycia danych" + +- +- "Używaj randomizowanego adresu MAC (domyślnie)" +- "Używaj adresu MAC urządzenia" +- + + "Nie" + "Tak" +diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml +index 0cb0d0c1ee..6bbd0c3d35 100644 +--- a/res/values-pt-rBR/arrays.xml ++++ b/res/values-pt-rBR/arrays.xml +@@ -475,10 +475,6 @@ + "Tratar como limitada" + "Tratar como ilimitada" + +- +- "Usar MAC aleatório (padrão)" +- "Usar MAC do dispositivo" +- + + "Não" + "Sim" +diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml +index aec6985e28..953ce83cb7 100644 +--- a/res/values-pt-rPT/arrays.xml ++++ b/res/values-pt-rPT/arrays.xml +@@ -475,10 +475,6 @@ + "Tratar como acesso limitado" + "Tratar como acesso ilimitado" + +- +- "Utilizar MAC aleatório (predefinição)" +- "Utilizar MAC do dispositivo" +- + + "Não" + "Sim" +diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml +index 0cb0d0c1ee..6bbd0c3d35 100644 +--- a/res/values-pt/arrays.xml ++++ b/res/values-pt/arrays.xml +@@ -475,10 +475,6 @@ + "Tratar como limitada" + "Tratar como ilimitada" + +- +- "Usar MAC aleatório (padrão)" +- "Usar MAC do dispositivo" +- + + "Não" + "Sim" +diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml +index f12e145e4d..d31680423b 100644 +--- a/res/values-ro/arrays.xml ++++ b/res/values-ro/arrays.xml +@@ -475,10 +475,6 @@ + "Tratează ca fiind contorizată" + "Tratează ca fiind necontorizată" + +- +- "Folosiți o adresă MAC aleatorie (prestabilit)" +- "Folosiți adresa MAC a dispozitivului" +- + + "Nu" + "Da" +diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml +index ac5e085dc1..4f3f001d52 100644 +--- a/res/values-ru/arrays.xml ++++ b/res/values-ru/arrays.xml +@@ -475,10 +475,6 @@ + "С тарификацией" + "Без тарификации" + +- +- "Случайный MAC-адрес (по умолчанию)" +- "MAC-адрес устройства" +- + + "Нет" + "Да" +diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml +index 67c9a97f09..967ab1847a 100644 +--- a/res/values-si/arrays.xml ++++ b/res/values-si/arrays.xml +@@ -475,10 +475,6 @@ + "මනින ලද ලෙස සලකන්න" + "නොමනින ලද ලෙස සලකන්න" + +- +- "අහඹු කළ MAC භාවිත කරන්න (පෙරනිමි)" +- "MAC උපාංගය භාවිත කරන්න" +- + + "නැත" + "ඔව්" +diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml +index 639e8faafa..b4bceee991 100644 +--- a/res/values-sk/arrays.xml ++++ b/res/values-sk/arrays.xml +@@ -475,10 +475,6 @@ + "Považovať za meranú sieť" + "Považovať za nemeranú sieť" + +- +- "Používať randomizovanú adresu MAC (predvolené)" +- "Použiť adresu MAC zariadenia" +- + + "Nie" + "Áno" +diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml +index 31ff81fef9..4bc9cf638e 100644 +--- a/res/values-sl/arrays.xml ++++ b/res/values-sl/arrays.xml +@@ -475,10 +475,6 @@ + "Obravnavaj kot: omejen prenos podatkov" + "Obravnavaj kot: neomejen prenos podatkov" + +- +- "Uporaba naključno izbranega naslova MAC (privzeto)" +- "Uporaba naslova MAC naprave" +- + + "Ne" + "Da" +diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml +index 5a9fde5c17..fe8b19cf2b 100644 +--- a/res/values-sq/arrays.xml ++++ b/res/values-sq/arrays.xml +@@ -475,10 +475,6 @@ + "Trajto si me matje" + "Trajto si pa matje" + +- +- "Përdor adresë MAC të rastësishme (parazgjedhje)" +- "Përdor adresën MAC të pajisjes" +- + + "Jo" + "Po" +diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml +index 1c975e04c8..8308828975 100644 +--- a/res/values-sr/arrays.xml ++++ b/res/values-sr/arrays.xml +@@ -475,10 +475,6 @@ + "Третирај као мрежу са ограничењем" + "Третирај као мрежу без ограничења" + +- +- "Користи насумично изабрану MAC адресу (подразумевано)" +- "Користи MAC адресу уређаја" +- + + "Не" + "Да" +diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml +index 00c54a0cb6..95a2a40c9c 100644 +--- a/res/values-sv/arrays.xml ++++ b/res/values-sv/arrays.xml +@@ -475,10 +475,6 @@ + "Behandla som nätverk med datapriser" + "Behandla som nätverk utan datapriser" + +- +- "Använd slumpgenererad MAC-adress (standard)" +- "Använd enhetens MAC-adress" +- + + "Nej" + "Ja" +diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml +index 6eed66078e..d9bffc9693 100644 +--- a/res/values-sw/arrays.xml ++++ b/res/values-sw/arrays.xml +@@ -475,10 +475,6 @@ + "Tumia kama mtandao unaopima data" + "Tumia kama mtandao usiopima data" + +- +- "Anwani ya MAC bila utaratibu wowote (chaguomsingi)" +- "Tumia anwani ya MAC ya kifaa" +- + + "Hapana" + "Ndiyo" +diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml +index 9135fffcfa..f894b9247d 100644 +--- a/res/values-ta/arrays.xml ++++ b/res/values-ta/arrays.xml +@@ -475,10 +475,6 @@ + "டேட்டா அளவிடப்பட்டது" + "டேட்டா அளவிடப்படாதது" + +- +- "ரேண்டம் MACகைப் பயன்படுத்து (இயல்புநிலை)" +- "சாதன MACகைப் பயன்படுத்து" +- + + "வேண்டாம்" + "ஆம்" +diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml +index 7c9270691b..fd2f4ce74f 100644 +--- a/res/values-te/arrays.xml ++++ b/res/values-te/arrays.xml +@@ -475,10 +475,6 @@ + "గణించబడేదానిగా పరిగణించండి" + "గణించబడనిదిగా పరిగణించండి" + +- +- "యాదృచ్ఛిక MAC అడ్రస్‌ని ఉపయోగించండి (డిఫాల్ట్)" +- "పరికర MAC అడ్రస్‌ని ఉపయోగించండి" +- + + "లేదు" + "అవును" +diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml +index 33fbe3bb8c..723d88c59c 100644 +--- a/res/values-th/arrays.xml ++++ b/res/values-th/arrays.xml +@@ -475,10 +475,6 @@ + "ถือว่ามีการวัดปริมาณอินเทอร์เน็ต" + "ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต" + +- +- "ใช้ MAC แบบสุ่ม (ค่าเริ่มต้น)" +- "ใช้ที่อยู่ MAC ของอุปกรณ์" +- + + "ไม่" + "ใช่" +diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml +index 3d439a67e6..62d500b96f 100644 +--- a/res/values-tl/arrays.xml ++++ b/res/values-tl/arrays.xml +@@ -475,10 +475,6 @@ + "Ituring bilang nakametro" + "Ituring bilang hindi nakametro" + +- +- "Gamitin ang na-randomize na MAC (default)" +- "Gamitin ang device MAC" +- + + "Hindi" + "Oo" +diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml +index 080847c4cb..e4f388e05c 100644 +--- a/res/values-tr/arrays.xml ++++ b/res/values-tr/arrays.xml +@@ -475,10 +475,6 @@ + "Sınırlı olarak ele al" + "Sınırsız olarak ele al" + +- +- "Rastgele MAC kullan (varsayılan)" +- "Cihazın MAC adresini kullan" +- + + "Hayır" + "Evet" +diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml +index 850a400846..c001d9a2a3 100644 +--- a/res/values-uk/arrays.xml ++++ b/res/values-uk/arrays.xml +@@ -475,10 +475,6 @@ + "Вважати тарифікованою" + "Вважати нетарифікованою" + +- +- "Використовувати довільну MAC-адресу (за умовчанням)" +- "Використовувати MAC-адресу пристрою" +- + + "Ні" + "Так" +diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml +index 8b13cf953d..4b377bfc5a 100644 +--- a/res/values-ur/arrays.xml ++++ b/res/values-ur/arrays.xml +@@ -475,10 +475,6 @@ + "میٹر شدہ کے بطور خیال کریں" + "غیر میٹر شدہ کے بطور خیال کریں" + +- +- "‏بے ترتیب MAC کا استعمال کریں (ڈیفالٹ)" +- "‏آلہ کا MAC استعمال کریں" +- + + "نہیں" + "ہاں" +diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml +index abe944c792..775149e27c 100644 +--- a/res/values-uz/arrays.xml ++++ b/res/values-uz/arrays.xml +@@ -475,10 +475,6 @@ + "Bu – pulli tarmoq" + "Bu – bepul tarmoq" + +- +- "Ixtiyoriy MAC manzil (standart)" +- "Ixtiyoriy MAC manzil" +- + + "Yo‘q" + "Ha" +diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml +index e54b3bc05c..d988e368a5 100644 +--- a/res/values-vi/arrays.xml ++++ b/res/values-vi/arrays.xml +@@ -475,10 +475,6 @@ + "Coi như có đo lượng dữ liệu" + "Coi như không đo lượng dữ liệu" + +- +- "Sử dụng MAC ngẫu nhiên (mặc định)" +- "Sử dụng MAC của thiết bị" +- + + "Không" + "Có" +diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml +index fffcf47ae6..1b4a951c70 100644 +--- a/res/values-zh-rCN/arrays.xml ++++ b/res/values-zh-rCN/arrays.xml +@@ -475,10 +475,6 @@ + "视为按流量计费" + "视为不按流量计费" + +- +- "使用随机 MAC（默认）" +- "使用设备 MAC" +- + + "否" + "是" +diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml +index 7055620562..9de09cd360 100644 +--- a/res/values-zh-rHK/arrays.xml ++++ b/res/values-zh-rHK/arrays.xml +@@ -475,10 +475,6 @@ + "設定為按用量收費" + "設定為非按用量收費" + +- +- "使用隨機 MAC (預設)" +- "使用裝置 MAC" +- + + "否" + "是" +diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml +index 2dd50e6cc8..932faf2958 100644 +--- a/res/values-zh-rTW/arrays.xml ++++ b/res/values-zh-rTW/arrays.xml +@@ -475,10 +475,6 @@ + "視為計量付費" + "視為非計量付費" + +- +- "使用隨機化 MAC (預設)" +- "使用裝置 MAC" +- + + "否" + "是" +diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml +index 9a31ab4a07..aa7ae71e02 100644 +--- a/res/values-zu/arrays.xml ++++ b/res/values-zu/arrays.xml +@@ -475,10 +475,6 @@ + "Phatha njengokulinganisiwe" + "Phatha njengokungalinganisiwe" + +- +- "Sebenzisa i-MAC engahleliwe (okuzenzakalelayo)" +- "Sebenzisa i-MAC yedivayisi" +- + + "Cha" + "Yebo" diff --git a/Patches/LineageOS-17.1/android_packages_modules_NetworkStack/0001-Random_MAC.patch b/Patches/LineageOS-17.1/android_packages_modules_NetworkStack/0001-Random_MAC.patch new file mode 100644 index 00000000..c7dfee41 --- /dev/null +++ b/Patches/LineageOS-17.1/android_packages_modules_NetworkStack/0001-Random_MAC.patch @@ -0,0 +1,71 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Pratyush <39559233+empratyush@users.noreply.github.com> +Date: Thu, 20 May 2021 13:21:31 +0530 +Subject: [PATCH] avoid reusing DHCP state for full MAC randomization + +--- + src/android/net/dhcp/DhcpClient.java | 30 +++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java +index c45fc82..b62239c 100644 +--- a/src/android/net/dhcp/DhcpClient.java ++++ b/src/android/net/dhcp/DhcpClient.java +@@ -60,6 +60,9 @@ import android.net.metrics.IpConnectivityLog; + import android.net.util.InterfaceParams; + import android.net.util.NetworkStackUtils; + import android.net.util.SocketUtils; ++import android.net.wifi.WifiConfiguration; ++import android.net.wifi.WifiInfo; ++import android.net.wifi.WifiManager; + import android.os.Message; + import android.os.SystemClock; + import android.system.ErrnoException; +@@ -84,6 +87,8 @@ import java.net.SocketAddress; + import java.net.SocketException; + import java.nio.ByteBuffer; + import java.util.Arrays; ++import java.util.ArrayList; ++import java.util.List; + import java.util.Random; + + /** +@@ -917,7 +922,7 @@ public class DhcpClient extends StateMachine { + + " lease expiry: " + attributes.assignedV4AddressExpiry + + " current time: " + currentTime); + } +- if (currentTime >= attributes.assignedV4AddressExpiry) { ++ if (currentTime >= attributes.assignedV4AddressExpiry || shouldAvoidStateReuse()) { + // Lease has expired. + transitionTo(mDhcpInitState); + return HANDLED; +@@ -941,6 +946,29 @@ public class DhcpClient extends StateMachine { + } + } + ++ private static final int RANDOMIZATION_ALWAYS = 100; ++ ++ private boolean shouldAvoidStateReuse() { ++ try { ++ WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); ++ WifiInfo wifiInfo = wifiManager.getConnectionInfo(); ++ if (wifiInfo != null) { ++ int connectedNetworkId = wifiInfo.getNetworkId(); ++ List configurationList = wifiManager.getConfiguredNetworks(); ++ for (WifiConfiguration configuration : configurationList){ ++ if (configuration.networkId == connectedNetworkId){ ++ return configuration.macRandomizationSetting == RANDOMIZATION_ALWAYS; ++ } ++ } ++ } ++ } catch (Exception e) { ++ loge(e.getLocalizedMessage(), e); ++ } ++ ++ loge("ConfiguredNetworks should contain Connected network id config"); ++ return true; ++ } ++ + class DhcpInitState extends PacketRetransmittingState { + public DhcpInitState() { + super(); diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0019-Random_MAC.patch b/Patches/LineageOS-18.1/android_frameworks_base/0019-Random_MAC.patch new file mode 100644 index 00000000..e72e229a --- /dev/null +++ b/Patches/LineageOS-18.1/android_frameworks_base/0019-Random_MAC.patch @@ -0,0 +1,75 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Renlord +Date: Fri, 13 Dec 2019 22:44:39 +1100 +Subject: [PATCH] add option of always randomizing MAC addresses + +--- + api/system-current.txt | 1 + + wifi/api/system-current.txt | 1 + + wifi/java/android/net/wifi/WifiConfiguration.java | 15 +++++++++++---- + 3 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/api/system-current.txt b/api/system-current.txt +index f07ebaf19cb6..21dbbbc244a6 100755 +--- a/api/system-current.txt ++++ b/api/system-current.txt +@@ -7117,6 +7117,7 @@ package android.net.wifi { + field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1 + field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0 + field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2 ++ field @Deprecated public static final int RANDOMIZATION_ALWAYS = 100; // 0x64 + field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0 + field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1 + field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11 +diff --git a/wifi/api/system-current.txt b/wifi/api/system-current.txt +index 07793c1eb02a..2a9fa1093774 100644 +--- a/wifi/api/system-current.txt ++++ b/wifi/api/system-current.txt +@@ -320,6 +320,7 @@ package android.net.wifi { + field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1 + field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0 + field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2 ++ field @Deprecated public static final int RANDOMIZATION_ALWAYS = 100; // 0x64 + field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0 + field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1 + field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11 +diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java +index 71f0ab8087ab..8f52ba46a409 100644 +--- a/wifi/java/android/net/wifi/WifiConfiguration.java ++++ b/wifi/java/android/net/wifi/WifiConfiguration.java +@@ -1130,7 +1130,8 @@ public class WifiConfiguration implements Parcelable { + @Retention(RetentionPolicy.SOURCE) + @IntDef(prefix = {"RANDOMIZATION_"}, value = { + RANDOMIZATION_NONE, +- RANDOMIZATION_PERSISTENT}) ++ RANDOMIZATION_PERSISTENT, ++ RANDOMIZATION_ALWAYS}) + public @interface MacRandomizationSetting {} + + /** +@@ -1145,16 +1146,22 @@ public class WifiConfiguration implements Parcelable { + */ + @SystemApi + public static final int RANDOMIZATION_PERSISTENT = 1; ++ /** ++ * @hide ++ * Generate a randomize MAC always ++ */ ++ @SystemApi ++ public static final int RANDOMIZATION_ALWAYS = 100; + + /** + * Level of MAC randomization for this network. +- * One of {@link #RANDOMIZATION_NONE} or {@link #RANDOMIZATION_PERSISTENT}. +- * By default this field is set to {@link #RANDOMIZATION_PERSISTENT}. ++ * One of {@link #RANDOMIZATION_NONE} or {@link #RANDOMIZATION_PERSISTENT} or RANDOMIZATION_ALWAYS. ++ * By default this field is set to RANDOMIZATION_ALWAYS in GrapheneOS. + * @hide + */ + @SystemApi + @MacRandomizationSetting +- public int macRandomizationSetting = RANDOMIZATION_PERSISTENT; ++ public int macRandomizationSetting = RANDOMIZATION_ALWAYS; + + /** + * @hide diff --git a/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch new file mode 100644 index 00000000..1f09f80c --- /dev/null +++ b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch @@ -0,0 +1,192 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Renlord +Date: Sat, 21 Dec 2019 00:33:56 +1100 +Subject: [PATCH] add support for always generating new random MAC + +To trigger re-generation of randomized MAC addressed for an already +connected AP. User simply has to toggle on/off wifi. Otherwise, on +re-connection, a new randomized MAC address also gets generated. +--- + .../wifitrackerlib/StandardWifiEntry.java | 34 ++++++++++++++----- + .../com/android/wifitrackerlib/WifiEntry.java | 1 + + .../android/server/wifi/ClientModeImpl.java | 5 +-- + .../server/wifi/WifiConfigManager.java | 13 +++++-- + .../server/wifi/WifiConfigurationUtil.java | 2 +- + .../com/android/server/wifi/WifiMetrics.java | 4 +-- + 6 files changed, 43 insertions(+), 16 deletions(-) + +diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java +index 51270545b..a96ba03e3 100644 +--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java ++++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java +@@ -324,7 +324,7 @@ public class StandardWifiEntry extends WifiEntry { + return wifiInfoMac; + } + } +- if (mWifiConfig == null || getPrivacy() != PRIVACY_RANDOMIZED_MAC) { ++ if (mWifiConfig == null || getPrivacy() == PRIVACY_DEVICE_MAC) { + final String[] factoryMacs = mWifiManager.getFactoryMacAddresses(); + if (factoryMacs.length > 0) { + return factoryMacs[0]; +@@ -578,11 +578,19 @@ public class StandardWifiEntry extends WifiEntry { + @Override + @Privacy + public int getPrivacy() { +- if (mWifiConfig != null +- && mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_NONE) { +- return PRIVACY_DEVICE_MAC; ++ if (mWifiConfig != null) { ++ switch(mWifiConfig.macRandomizationSetting) { ++ case WifiConfiguration.RANDOMIZATION_NONE: ++ return PRIVACY_DEVICE_MAC; ++ case WifiConfiguration.RANDOMIZATION_PERSISTENT: ++ return PRIVACY_RANDOMIZED_MAC; ++ case WifiConfiguration.RANDOMIZATION_ALWAYS: ++ return PRIVACY_FULLY_RANDOMIZED_MAC; ++ default: ++ return PRIVACY_FULLY_RANDOMIZED_MAC; ++ } + } else { +- return PRIVACY_RANDOMIZED_MAC; ++ return PRIVACY_FULLY_RANDOMIZED_MAC; + } + } + +@@ -591,9 +599,7 @@ public class StandardWifiEntry extends WifiEntry { + if (!canSetPrivacy()) { + return; + } +- +- mWifiConfig.macRandomizationSetting = privacy == PRIVACY_RANDOMIZED_MAC +- ? WifiConfiguration.RANDOMIZATION_PERSISTENT : WifiConfiguration.RANDOMIZATION_NONE; ++ mWifiConfig.macRandomizationSetting = translatePrivacyToWifiConfigurationValues(privacy); + mWifiManager.save(mWifiConfig, null /* listener */); + } + +@@ -929,4 +935,16 @@ public class StandardWifiEntry extends WifiEntry { + String getNetworkSelectionDescription() { + return Utils.getNetworkSelectionDescription(getWifiConfiguration()); + } ++ ++ private static int translatePrivacyToWifiConfigurationValues(int privacy_value) { ++ switch(privacy_value) { ++ case PRIVACY_FULLY_RANDOMIZED_MAC: ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ case PRIVACY_RANDOMIZED_MAC: ++ return WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ case PRIVACY_DEVICE_MAC: ++ return WifiConfiguration.RANDOMIZATION_NONE; ++ } ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ } + } +diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java +index 92c2ed531..3cd333fd3 100644 +--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java ++++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java +@@ -149,6 +149,7 @@ public abstract class WifiEntry implements Comparable { + public static final int PRIVACY_DEVICE_MAC = 0; + public static final int PRIVACY_RANDOMIZED_MAC = 1; + public static final int PRIVACY_UNKNOWN = 2; ++ public static final int PRIVACY_FULLY_RANDOMIZED_MAC = 100; + + @Retention(RetentionPolicy.SOURCE) + @IntDef(value = { +diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java +index 14866c87e..8db407fa3 100644 +--- a/service/java/com/android/server/wifi/ClientModeImpl.java ++++ b/service/java/com/android/server/wifi/ClientModeImpl.java +@@ -6452,7 +6452,8 @@ public class ClientModeImpl extends StateMachine { + } + + if (isConnectedMacRandomizationEnabled()) { +- if (config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ if (config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT || ++ config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_ALWAYS) { + configureRandomizedMacAddress(config); + } else { + setCurrentMacToFactoryMac(config); +@@ -6489,7 +6490,7 @@ public class ClientModeImpl extends StateMachine { + (config.getIpAssignment() == IpConfiguration.IpAssignment.STATIC); + final boolean isUsingMacRandomization = + config.macRandomizationSetting +- == WifiConfiguration.RANDOMIZATION_PERSISTENT ++ != WifiConfiguration.RANDOMIZATION_NONE + && isConnectedMacRandomizationEnabled(); + if (mVerboseLoggingEnabled) { + final String key = config.getKey(); +diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java +index 8fc91cb09..25304cca4 100644 +--- a/service/java/com/android/server/wifi/WifiConfigManager.java ++++ b/service/java/com/android/server/wifi/WifiConfigManager.java +@@ -425,9 +425,14 @@ public class WifiConfigManager { + */ + public boolean shouldUseAggressiveRandomization(WifiConfiguration config) { + if (!isMacRandomizationSupported() +- || config.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ || config.macRandomizationSetting < WifiConfiguration.RANDOMIZATION_PERSISTENT) { + return false; + } ++ ++ if (config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_ALWAYS) { ++ return true; ++ } ++ + if (mFrameworkFacade.getIntegerSetting(mContext, + ENHANCED_MAC_RANDOMIZATION_FEATURE_FORCE_ENABLE_FLAG, 0) == 1) { + return true; +@@ -546,7 +551,9 @@ public class WifiConfigManager { + */ + private MacAddress updateRandomizedMacIfNeeded(WifiConfiguration config) { + boolean shouldUpdateMac = config.randomizedMacExpirationTimeMs +- < mClock.getWallClockMillis(); ++ < mClock.getWallClockMillis() || ++ config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_ALWAYS; ++ + if (!shouldUpdateMac) { + return config.getRandomizedMacAddress(); + } +@@ -1579,7 +1586,7 @@ public class WifiConfigManager { + public boolean isInFlakyRandomizationSsidHotlist(int networkId) { + WifiConfiguration config = getConfiguredNetwork(networkId); + return config != null +- && config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT ++ && config.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_NONE + && mDeviceConfigFacade.getRandomizationFlakySsidHotlist().contains(config.SSID); + } + +diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java +index 336d97810..9c3e074ae 100644 +--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java ++++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java +@@ -203,7 +203,7 @@ public class WifiConfigurationUtil { + public static boolean hasMacRandomizationSettingsChanged(WifiConfiguration existingConfig, + WifiConfiguration newConfig) { + if (existingConfig == null) { +- return newConfig.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ return newConfig.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_ALWAYS; + } + return newConfig.macRandomizationSetting != existingConfig.macRandomizationSetting; + } +diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java +index 75d53fc95..4ef2e5f8e 100644 +--- a/service/java/com/android/server/wifi/WifiMetrics.java ++++ b/service/java/com/android/server/wifi/WifiMetrics.java +@@ -1556,7 +1556,7 @@ public class WifiMetrics { + if (config != null) { + mCurrentConnectionEvent.mConnectionEvent.useRandomizedMac = + config.macRandomizationSetting +- == WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ != WifiConfiguration.RANDOMIZATION_NONE; + mCurrentConnectionEvent.mConnectionEvent.useAggressiveMac = + mWifiConfigManager.shouldUseAggressiveRandomization(config); + mCurrentConnectionEvent.mConnectionEvent.connectionNominator = +@@ -3958,7 +3958,7 @@ public class WifiMetrics { + if (config.isPasspoint()) { + mWifiLogProto.numPasspointNetworks++; + } +- if (config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ if (config.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_NONE) { + mWifiLogProto.numSavedNetworksWithMacRandomization++; + } + } 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 new file mode 100644 index 00000000..fb97d4ab --- /dev/null +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-1.patch @@ -0,0 +1,193 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Renlord +Date: Sun, 8 Dec 2019 23:58:24 +0100 +Subject: [PATCH] add option to always randomize MAC + +RANDOMIZATION_ALWAYS is set as the default option +--- + res/values/arrays.xml | 4 ++- + .../WifiDetailPreferenceController.java | 5 +-- + .../WifiPrivacyPreferenceController.java | 31 ++++++++++++++----- + .../WifiDetailPreferenceController2.java | 2 +- + .../WifiPrivacyPreferenceController2.java | 31 +++++++++++++++---- + 5 files changed, 56 insertions(+), 17 deletions(-) + +diff --git a/res/values/arrays.xml b/res/values/arrays.xml +index 6259f4d1a5..e93794e955 100644 +--- a/res/values/arrays.xml ++++ b/res/values/arrays.xml +@@ -1332,7 +1332,8 @@ + + + +- Use randomized MAC (default) ++ Use fully randomized MAC (default) ++ Use per-network randomized MAC + Use device MAC + + +@@ -1348,6 +1349,7 @@ + + + ++ 100 + 1 + 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 +--- 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 + + // return randomized MAC address + if (mWifiConfig != null && +- mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { ++ (mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT ++ || mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_ALWAYS)) { + return mWifiConfig.getRandomizedMacAddress().toString(); + } + +@@ -1288,7 +1289,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController + + mMacAddressPref.setTitle( + (mWifiConfig.macRandomizationSetting +- == WifiConfiguration.RANDOMIZATION_PERSISTENT) ++ != WifiConfiguration.RANDOMIZATION_NONE) + ? R.string.wifi_advanced_randomized_mac_address_title + : 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 +--- 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 + if (mWifiConfiguration != null) { + return mWifiConfiguration.macRandomizationSetting; + } +- return WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; + } + +- private static final int PREF_RANDOMIZATION_PERSISTENT = 0; +- private static final int PREF_RANDOMIZATION_NONE = 1; ++ private static final int PREF_RANDOMIZATION_ALWAYS = 0; ++ private static final int PREF_RANDOMIZATION_PERSISTENT = 1; ++ private static final int PREF_RANDOMIZATION_NONE = 2; + + /** + * Returns preference index value. +@@ -128,8 +129,16 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im + * @return index value of preference + */ + public static int translateMacRandomizedValueToPrefValue(int macRandomized) { +- return (macRandomized == WifiConfiguration.RANDOMIZATION_PERSISTENT) +- ? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE; ++ switch (macRandomized) { ++ case WifiConfiguration.RANDOMIZATION_ALWAYS: ++ return PREF_RANDOMIZATION_ALWAYS; ++ case WifiConfiguration.RANDOMIZATION_PERSISTENT: ++ return PREF_RANDOMIZATION_PERSISTENT; ++ case WifiConfiguration.RANDOMIZATION_NONE: ++ return PREF_RANDOMIZATION_NONE; ++ default: ++ return PREF_RANDOMIZATION_ALWAYS; ++ } + } + + /** +@@ -139,8 +148,16 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im + * @return mac randomized value + */ + public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) { +- return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT) +- ? WifiConfiguration.RANDOMIZATION_PERSISTENT : WifiConfiguration.RANDOMIZATION_NONE; ++ switch (prefMacRandomized) { ++ case PREF_RANDOMIZATION_ALWAYS: ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ case PREF_RANDOMIZATION_PERSISTENT: ++ return WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ case PREF_RANDOMIZATION_NONE: ++ return WifiConfiguration.RANDOMIZATION_NONE; ++ default: ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ } + } + + 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 +--- 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 + + mMacAddressPref.setVisible(true); + +- mMacAddressPref.setTitle((mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) ++ mMacAddressPref.setTitle((mWifiEntry.getPrivacy() != WifiEntry.PRIVACY_DEVICE_MAC) + ? R.string.wifi_advanced_randomized_mac_address_title + : 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 +--- 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 + return mWifiEntry.getPrivacy(); + } + +- private static final int PREF_RANDOMIZATION_PERSISTENT = 0; +- private static final int PREF_RANDOMIZATION_NONE = 1; ++ private static final int PREF_RANDOMIZATION_ALWAYS = 0; ++ private static final int PREF_RANDOMIZATION_PERSISTENT = 1; ++ private static final int PREF_RANDOMIZATION_NONE = 2; + + /** + * Returns preference index value. +@@ -110,8 +111,16 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i + * @return index value of preference + */ + public static int translateMacRandomizedValueToPrefValue(int macRandomized) { +- return (macRandomized == WifiEntry.PRIVACY_RANDOMIZED_MAC) +- ? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE; ++ switch (macRandomized) { ++ case WifiConfiguration.RANDOMIZATION_ALWAYS: ++ return PREF_RANDOMIZATION_ALWAYS; ++ case WifiConfiguration.RANDOMIZATION_PERSISTENT: ++ return PREF_RANDOMIZATION_PERSISTENT; ++ case WifiConfiguration.RANDOMIZATION_NONE: ++ return PREF_RANDOMIZATION_NONE; ++ default: ++ return PREF_RANDOMIZATION_ALWAYS; ++ } + } + + /** +@@ -121,8 +130,16 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i + * @return mac randomized value + */ + public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) { +- return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT) +- ? WifiEntry.PRIVACY_RANDOMIZED_MAC : WifiEntry.PRIVACY_DEVICE_MAC; ++ switch (prefMacRandomized) { ++ case PREF_RANDOMIZATION_ALWAYS: ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ case PREF_RANDOMIZATION_PERSISTENT: ++ return WifiConfiguration.RANDOMIZATION_PERSISTENT; ++ case PREF_RANDOMIZATION_NONE: ++ return WifiConfiguration.RANDOMIZATION_NONE; ++ default: ++ return WifiConfiguration.RANDOMIZATION_ALWAYS; ++ } + } + + private void updateSummary(DropDownPreference preference, int macRandomized) { +@@ -152,6 +169,8 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i + return WifiEntry.PRIVACY_DEVICE_MAC; + case WifiConfiguration.RANDOMIZATION_PERSISTENT: + return WifiEntry.PRIVACY_RANDOMIZED_MAC; ++ case WifiConfiguration.RANDOMIZATION_ALWAYS: ++ return WifiEntry.PRIVACY_FULLY_RANDOMIZED_MAC; + default: + return WifiEntry.PRIVACY_UNKNOWN; + } 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 new file mode 100644 index 00000000..c06f17df --- /dev/null +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0011-Random_MAC-2.patch @@ -0,0 +1,1368 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Daniel Micay +Date: Wed, 2 Dec 2020 10:38:08 -0500 +Subject: [PATCH] remove partial MAC randomization translations + +--- + res/values-af/arrays.xml | 4 ---- + res/values-am/arrays.xml | 4 ---- + res/values-ar/arrays.xml | 4 ---- + res/values-as/arrays.xml | 4 ---- + res/values-az/arrays.xml | 4 ---- + res/values-b+sr+Latn/arrays.xml | 4 ---- + res/values-be/arrays.xml | 4 ---- + res/values-bg/arrays.xml | 4 ---- + res/values-bn/arrays.xml | 4 ---- + res/values-bs/arrays.xml | 4 ---- + res/values-ca/arrays.xml | 4 ---- + res/values-cs/arrays.xml | 4 ---- + res/values-da/arrays.xml | 4 ---- + res/values-de/arrays.xml | 4 ---- + res/values-el/arrays.xml | 4 ---- + res/values-en-rAU/arrays.xml | 4 ---- + res/values-en-rCA/arrays.xml | 4 ---- + res/values-en-rGB/arrays.xml | 4 ---- + res/values-en-rIN/arrays.xml | 4 ---- + res/values-en-rXC/arrays.xml | 4 ---- + res/values-es-rUS/arrays.xml | 4 ---- + res/values-es/arrays.xml | 4 ---- + res/values-et/arrays.xml | 4 ---- + res/values-eu/arrays.xml | 4 ---- + res/values-fa/arrays.xml | 4 ---- + res/values-fi/arrays.xml | 4 ---- + res/values-fr-rCA/arrays.xml | 4 ---- + res/values-fr/arrays.xml | 4 ---- + res/values-gl/arrays.xml | 4 ---- + res/values-gu/arrays.xml | 4 ---- + res/values-hi/arrays.xml | 4 ---- + res/values-hr/arrays.xml | 4 ---- + res/values-hu/arrays.xml | 4 ---- + res/values-hy/arrays.xml | 4 ---- + res/values-in/arrays.xml | 4 ---- + res/values-is/arrays.xml | 4 ---- + res/values-it/arrays.xml | 4 ---- + res/values-iw/arrays.xml | 4 ---- + res/values-ja/arrays.xml | 4 ---- + res/values-ka/arrays.xml | 4 ---- + res/values-kk/arrays.xml | 4 ---- + res/values-km/arrays.xml | 4 ---- + res/values-kn/arrays.xml | 4 ---- + res/values-ko/arrays.xml | 4 ---- + res/values-ky/arrays.xml | 4 ---- + res/values-lo/arrays.xml | 4 ---- + res/values-lt/arrays.xml | 4 ---- + res/values-lv/arrays.xml | 4 ---- + res/values-mk/arrays.xml | 4 ---- + res/values-ml/arrays.xml | 4 ---- + res/values-mn/arrays.xml | 4 ---- + res/values-mr/arrays.xml | 4 ---- + res/values-ms/arrays.xml | 4 ---- + res/values-my/arrays.xml | 4 ---- + res/values-nb/arrays.xml | 4 ---- + res/values-ne/arrays.xml | 4 ---- + res/values-nl/arrays.xml | 4 ---- + res/values-or/arrays.xml | 4 ---- + res/values-pa/arrays.xml | 4 ---- + res/values-pl/arrays.xml | 4 ---- + res/values-pt-rBR/arrays.xml | 4 ---- + res/values-pt-rPT/arrays.xml | 4 ---- + res/values-pt/arrays.xml | 4 ---- + res/values-ro/arrays.xml | 4 ---- + res/values-ru/arrays.xml | 4 ---- + res/values-si/arrays.xml | 4 ---- + res/values-sk/arrays.xml | 4 ---- + res/values-sl/arrays.xml | 4 ---- + res/values-sq/arrays.xml | 4 ---- + res/values-sr/arrays.xml | 4 ---- + res/values-sv/arrays.xml | 4 ---- + res/values-sw/arrays.xml | 4 ---- + res/values-ta/arrays.xml | 4 ---- + res/values-te/arrays.xml | 4 ---- + res/values-th/arrays.xml | 4 ---- + res/values-tl/arrays.xml | 4 ---- + res/values-tr/arrays.xml | 4 ---- + res/values-uk/arrays.xml | 4 ---- + res/values-ur/arrays.xml | 4 ---- + res/values-uz/arrays.xml | 4 ---- + res/values-vi/arrays.xml | 4 ---- + res/values-zh-rCN/arrays.xml | 4 ---- + res/values-zh-rHK/arrays.xml | 4 ---- + res/values-zh-rTW/arrays.xml | 4 ---- + res/values-zu/arrays.xml | 4 ---- + 85 files changed, 340 deletions(-) + +diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml +index 5b8ed28439..be4355ad42 100644 +--- a/res/values-af/arrays.xml ++++ b/res/values-af/arrays.xml +@@ -493,10 +493,6 @@ + "Hanteer as beperk" + "Hanteer as onbeperk" + +- +- "Gebruik ewekansige MAC (verstek)" +- "Gebruik toestel-MAC" +- + + "Nee" + "Ja" +diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml +index f44cb4809e..a343c0916f 100644 +--- a/res/values-am/arrays.xml ++++ b/res/values-am/arrays.xml +@@ -493,10 +493,6 @@ + "እንደ ተለካ አስተናግድ" + "እንደ ያልተለካ አስተናግድ" + +- +- "የዘፈቀደ ማክ ይጠቀሙ (ነባሪ)" +- "የመሣሪያ ማክ ይጠቀሙ" +- + + "አይ" + "አዎ" +diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml +index 4218a24b19..d0f3705583 100644 +--- a/res/values-ar/arrays.xml ++++ b/res/values-ar/arrays.xml +@@ -493,10 +493,6 @@ + "معاملة الشبكة باعتبارها تفرض تكلفة استخدام" + "معاملة الشبكة باعتبارها لا تفرض تكلفة استخدام" + +- +- "‏استخدام عنوان MAC عشوائي (الإعداد التلقائي)" +- "‏استخدام عنوان MAC للجهاز" +- + + "لا" + "نعم" +diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml +index ac224cbb33..d58efd7d84 100644 +--- a/res/values-as/arrays.xml ++++ b/res/values-as/arrays.xml +@@ -493,10 +493,6 @@ + "মিটাৰ কৰা হিছাপে আচৰণ কৰক" + "নিৰিখ অনিৰ্দিষ্ট বুলি গণ্য কৰক" + +- +- "যাদৃচ্ছিক MAC ব্যৱহাৰ কৰক (ডিফ’ল্ট)" +- "ডিভাইচৰ MAC ব্যৱহাৰ কৰক" +- + + "নহয়" + "হয়" +diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml +index 1a73dd637e..370387554f 100644 +--- a/res/values-az/arrays.xml ++++ b/res/values-az/arrays.xml +@@ -493,10 +493,6 @@ + "Limitli olaraq qəbul edin" + "Limitisiz olaraq qəbul edin" + +- +- "İxtiyari MAC (defolt) istifadə edin" +- "MAC cihazından istifadə edin" +- + + "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 +--- a/res/values-b+sr+Latn/arrays.xml ++++ b/res/values-b+sr+Latn/arrays.xml +@@ -493,10 +493,6 @@ + "Tretiraj kao mrežu sa ograničenjem" + "Tretiraj kao mrežu bez ograničenja" + +- +- "Koristi nasumično izabranu MAC adresu (podrazumevano)" +- "Koristi MAC adresu uređaja" +- + + "Ne" + "Da" +diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml +index 0e22b482df..8489cbbea3 100644 +--- a/res/values-be/arrays.xml ++++ b/res/values-be/arrays.xml +@@ -493,10 +493,6 @@ + "Лімітная" + "Безлімітная" + +- +- "Выпадковы MAC-адрас (стандартна)" +- "Выкарыстоўваць MAC-адрас прылады" +- + + "Не" + "Так" +diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml +index 6960746676..8a6c7315ab 100644 +--- a/res/values-bg/arrays.xml ++++ b/res/values-bg/arrays.xml +@@ -493,10 +493,6 @@ + "Третиране като мрежа с отчитане" + "Третиране като мрежа без отчитане" + +- +- "Произв. генериран MAC адрес (станд.)" +- "Използване на MAC адреса на устройството" +- + + "Не" + "Да" +diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml +index 8b5aaa17c6..5ec3f390df 100644 +--- a/res/values-bn/arrays.xml ++++ b/res/values-bn/arrays.xml +@@ -493,10 +493,6 @@ + "মিটারিং চালু রাখুন" + "মিটারিং বন্ধ রাখুন" + +- +- "র‍্যান্ডমাইজ করা MAC ব্যবহার করুন (ডিফল্ট)" +- "ডিভাইসের MAC ব্যবহার করুন" +- + + "না" + "হ্যাঁ" +diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml +index 7887d4ace3..89d6319717 100644 +--- a/res/values-bs/arrays.xml ++++ b/res/values-bs/arrays.xml +@@ -493,10 +493,6 @@ + "Tretiraj kao vezu s naplatom" + "Tretiraj kao vezu bez naplate" + +- +- "Koristi nasumičnu MAC adresu (zadano)" +- "Koristi MAC adresu uređaja" +- + + "Ne" + "Da" +diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml +index 30fa788c9b..aaf9df2524 100644 +--- a/res/values-ca/arrays.xml ++++ b/res/values-ca/arrays.xml +@@ -493,10 +493,6 @@ + "Tracta com a xarxa d\'ús mesurat" + "Tracta com a xarxa d\'ús no mesurat" + +- +- "Utilitza adreça MAC aleatòria (predeterminat)" +- "Utilitza adreça MAC del dispositiu" +- + + "No" + "Sí" +diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml +index 179cd3bf9b..c241bd3fb9 100644 +--- a/res/values-cs/arrays.xml ++++ b/res/values-cs/arrays.xml +@@ -493,10 +493,6 @@ + "Považovat za měřenou síť" + "Považovat za neměřenou síť" + +- +- "Použít náhodnou MAC (výchozí)" +- "Použít adresu MAC zařízení" +- + + "Ne" + "Ano" +diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml +index 2aa7c34f16..ba99b7518f 100644 +--- a/res/values-da/arrays.xml ++++ b/res/values-da/arrays.xml +@@ -493,10 +493,6 @@ + "Håndter som forbrugsafregnet netværk" + "Håndter som ubegrænset netværk" + +- +- "Anvend tilfældig MAC (standard)" +- "Anvend enhedens MAC" +- + + "Nej" + "Ja" +diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml +index e1b59f2c4f..ad443fdba3 100644 +--- a/res/values-de/arrays.xml ++++ b/res/values-de/arrays.xml +@@ -493,10 +493,6 @@ + "Wie \"kostenpflichtig\" behandeln" + "Wie \"ohne Datenlimit\" behandeln" + +- +- "Zufällige MAC-Adresse verwenden (Standard)" +- "MAC-Adresse des Geräts verwenden" +- + + "Nein" + "Ja" +diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml +index e0d0aa777e..5ebebacb42 100644 +--- a/res/values-el/arrays.xml ++++ b/res/values-el/arrays.xml +@@ -493,10 +493,6 @@ + "Χρήση ως δικτύου με περιορισμούς" + "Χρήση ως δικτύου χωρίς περιορισμούς" + +- +- "Χρήση τυχαίου MAC (προεπιλογή)" +- "Χρήση MAC συσκευής" +- + + "Όχι" + "Ναι" +diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml +index ec8510a50e..a06b19a556 100644 +--- a/res/values-en-rAU/arrays.xml ++++ b/res/values-en-rAU/arrays.xml +@@ -493,10 +493,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomised MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml +index 47c9e00e40..a06b19a556 100644 +--- a/res/values-en-rCA/arrays.xml ++++ b/res/values-en-rCA/arrays.xml +@@ -493,10 +493,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomized MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml +index ec8510a50e..a06b19a556 100644 +--- a/res/values-en-rGB/arrays.xml ++++ b/res/values-en-rGB/arrays.xml +@@ -493,10 +493,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomised MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml +index ec8510a50e..a06b19a556 100644 +--- a/res/values-en-rIN/arrays.xml ++++ b/res/values-en-rIN/arrays.xml +@@ -493,10 +493,6 @@ + "Treat as metered" + "Treat as unmetered" + +- +- "Use randomised MAC (default)" +- "Use device MAC" +- + + "No" + "Yes" +diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml +index d900cd1feb..cd7ded213a 100644 +--- a/res/values-en-rXC/arrays.xml ++++ b/res/values-en-rXC/arrays.xml +@@ -493,10 +493,6 @@ + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎Treat as metered‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎Treat as unmetered‎‏‎‎‏‎" + +- +- "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎Use randomized MAC (default)‎‏‎‎‏‎" +- "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎Use device MAC‎‏‎‎‏‎" +- + + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎No‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎Yes‎‏‎‎‏‎" +diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml +index b88ae64cdb..30bcf95977 100644 +--- a/res/values-es-rUS/arrays.xml ++++ b/res/values-es-rUS/arrays.xml +@@ -493,10 +493,6 @@ + "Tratar como red de uso medido" + "Tratar como red de uso no medido" + +- +- "Usar MAC aleatoria (pred.)" +- "Usar MAC del dispositivo" +- + + "No" + "Sí" +diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml +index 1f2dc1ad43..da3d30e84b 100644 +--- a/res/values-es/arrays.xml ++++ b/res/values-es/arrays.xml +@@ -493,10 +493,6 @@ + "Tratar como red de uso medido" + "Tratar como red de uso no medido" + +- +- "Usar dirección MAC aleatoria (predeterminado)" +- "Usar dirección MAC del dispositivo" +- + + "No" + "Sí" +diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml +index 036cf5fa1c..c9924740f8 100644 +--- a/res/values-et/arrays.xml ++++ b/res/values-et/arrays.xml +@@ -493,10 +493,6 @@ + "Käsitle mahupõhisena" + "Käsitle mittemahupõhisena" + +- +- "Kasuta juhuslikku MAC-aadressi (vaikeseade)" +- "Kasuta seadme MAC-aadressi" +- + + "Ei" + "Jah" +diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml +index ff3a8a92bd..18b3302c91 100644 +--- a/res/values-eu/arrays.xml ++++ b/res/values-eu/arrays.xml +@@ -493,10 +493,6 @@ + "Tratatu sare neurtu gisa" + "Tratatu neurtu gabeko sare gisa" + +- +- "Erabili ausaz aukeratutako MAC helbidea (lehenetsia)" +- "Erabili gailuaren MAC helbidea" +- + + "Ez" + "Bai" +diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml +index 9f010de3ee..67d2a51ba6 100644 +--- a/res/values-fa/arrays.xml ++++ b/res/values-fa/arrays.xml +@@ -493,10 +493,6 @@ + "محدودشده حساب شود" + "محدودنشده حساب شود" + +- +- "‏استفاده از MAC تصادفی (پیش‌فرض)" +- "‏استفاده از MAC دستگاه" +- + + "نه" + "بله" +diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml +index 92a3668e0b..dbb5afb461 100644 +--- a/res/values-fi/arrays.xml ++++ b/res/values-fi/arrays.xml +@@ -493,10 +493,6 @@ + "Merkitse maksulliseksi" + "Merkitse maksuttomaksi" + +- +- "Käytä satunnaistettua MACia (oletus)" +- "Käytä laitteen MAC-osoitetta" +- + + "Ei" + "Kyllä" +diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml +index 70688e9f99..2f322a7c53 100644 +--- a/res/values-fr-rCA/arrays.xml ++++ b/res/values-fr-rCA/arrays.xml +@@ -493,10 +493,6 @@ + "Considérer comme facturé à l\'usage" + "Considérer comme non facturé à l\'usage" + +- +- "Utiliser une adresse MAC aléatoire (par défaut)" +- "Utiliser l\'adresse MAC de l\'appareil" +- + + "Non" + "Oui" +diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml +index 93d84fd69b..75340a00c7 100644 +--- a/res/values-fr/arrays.xml ++++ b/res/values-fr/arrays.xml +@@ -493,10 +493,6 @@ + "Considérer comme facturé à l\'usage" + "Considérer comme non facturé à l\'usage" + +- +- "Utiliser adresse MAC aléatoire (par défaut)" +- "Utiliser adresse MAC de l\'appareil" +- + + "Non" + "Oui" +diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml +index 7aa91b8205..9c6e76bdc1 100644 +--- a/res/values-gl/arrays.xml ++++ b/res/values-gl/arrays.xml +@@ -493,10 +493,6 @@ + "Tratar como rede sen tarifa plana" + "Tratar como rede con tarifa plana" + +- +- "Usar MAC aleatorio (valor predeterminado)" +- "Usar dispositivo MAC" +- + + "Non" + "Si" +diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml +index 4c86afb43d..63c66d6dd7 100644 +--- a/res/values-gu/arrays.xml ++++ b/res/values-gu/arrays.xml +@@ -493,10 +493,6 @@ + "મીટર કરેલ તરીકે ગણો" + "મીટર ન કરેલ તરીકે ગણો" + +- +- "રેન્ડમ કરેલ MACનો ઉપયોગ કરો (ડિફૉલ્ટ)" +- "MAC ડિવાઇસનો ઉપયોગ કરો" +- + + "ના" + "હા" +diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml +index 322456e9ed..1ab9d6c8ff 100644 +--- a/res/values-hi/arrays.xml ++++ b/res/values-hi/arrays.xml +@@ -493,10 +493,6 @@ + "इस कनेक्शन में डेटा से जुड़ी पाबंदी है" + "इस कनेक्शन में डेटा से जुड़ी पाबंदी नहीं है" + +- +- "किसी भी MAC पते का इस्तेमाल करें (डिफ़ॉल्ट सेटिंग)" +- "डिवाइस MAC का इस्तेमाल करें" +- + + "नहीं" + "हां" +diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml +index 5c322b27b2..03a6f70ce4 100644 +--- a/res/values-hr/arrays.xml ++++ b/res/values-hr/arrays.xml +@@ -493,10 +493,6 @@ + "Mreža s ograničenim prometom" + "Mreža bez ograničenja prometa" + +- +- "Koristi nasumičnu MAC adresu (zadano)" +- "Upotrijebi MAC adresu uređaja" +- + + "Ne" + "Da" +diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml +index 8ea94c5485..e8a06c798c 100644 +--- a/res/values-hu/arrays.xml ++++ b/res/values-hu/arrays.xml +@@ -493,10 +493,6 @@ + "Kezelje forgalomkorlátosként" + "Kezelje nem forgalomkorlátosként" + +- +- "Véletlenszerű MAC-cím használata (alapértelmezett)" +- "Az eszköz MAC-címének használata" +- + + "Nem" + "Igen" +diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml +index 50238b9472..85c7718b22 100644 +--- a/res/values-hy/arrays.xml ++++ b/res/values-hy/arrays.xml +@@ -493,10 +493,6 @@ + "Սահմանափակ" + "Անսահմանափակ" + +- +- "Օգտագործել պատահական MAC հասցե (կանխադրված)" +- "Օգտագործել սարքի MAC հասցեն" +- + + "Ոչ" + "Այո" +diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml +index 0974a2b1fb..047bab995e 100644 +--- a/res/values-in/arrays.xml ++++ b/res/values-in/arrays.xml +@@ -493,10 +493,6 @@ + "Perlakukan sebagai berbayar" + "Perlakukan sebagai tidak berbayar" + +- +- "Gunakan MAC acak (default)" +- "Gunakan MAC perangkat" +- + + "Tidak" + "Ya" +diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml +index 90d6b3be01..0eb94fcc54 100644 +--- a/res/values-is/arrays.xml ++++ b/res/values-is/arrays.xml +@@ -493,10 +493,6 @@ + "Meðhöndla sem mælt" + "Meðhöndla sem ótakmarkað" + +- +- "Nota MAC-vistfang af handahófi (sjálfgefið)" +- "Nota MAC-vistfang tækis" +- + + "Nei" + "Já" +diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml +index 5a9f87f85c..afd37aa5df 100644 +--- a/res/values-it/arrays.xml ++++ b/res/values-it/arrays.xml +@@ -493,10 +493,6 @@ + "Considera a consumo" + "Considera non a consumo" + +- +- "Usa MAC casuale (predefinito)" +- "Usa MAC del dispositivo" +- + + "No" + "Sì" +diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml +index 1015c32ac6..a7a208034d 100644 +--- a/res/values-iw/arrays.xml ++++ b/res/values-iw/arrays.xml +@@ -493,10 +493,6 @@ + "יש להתייחס כרשת נמדדת" + "יש להתייחס כרשת לא נמדדת" + +- +- "‏שימוש ב-MAC אקראי (ברירת מחדל)" +- "‏שימוש ב-MAC של המכשיר" +- + + "לא" + "כן" +diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml +index a73bef3548..0b7e9f118c 100644 +--- a/res/values-ja/arrays.xml ++++ b/res/values-ja/arrays.xml +@@ -493,10 +493,6 @@ + "従量制として扱う" + "定額制として扱う" + +- +- "ランダム MAC を使用（デフォルト）" +- "デバイスの MAC を使用" +- + + "いいえ" + "はい" +diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml +index 077403f35f..0decbcd3b3 100644 +--- a/res/values-ka/arrays.xml ++++ b/res/values-ka/arrays.xml +@@ -493,10 +493,6 @@ + "ლიმიტირებულად ჩათვლა" + "არალიმიტირებულად ჩათვლა" + +- +- "შემთხვევითი MAC-ის გამოყენება (ნაგულ.)" +- "მოწყობილობის MAC-მისამართის გამოყენება" +- + + "არა" + "დიახ" +diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml +index a69562f1b9..69144b7ae0 100644 +--- a/res/values-kk/arrays.xml ++++ b/res/values-kk/arrays.xml +@@ -493,10 +493,6 @@ + "Трафик саналсын" + "Трафик саналмасын" + +- +- "Кездейсоқ MAC мекенжайын пайдалану (әдепкі)" +- "Құрылғының MAC мекенжайын пайдалану" +- + + "Жоқ" + "Иә" +diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml +index d074efd436..78c28f3276 100644 +--- a/res/values-km/arrays.xml ++++ b/res/values-km/arrays.xml +@@ -493,10 +493,6 @@ + "ចាត់​ទុកថាផ្អែកតាមទិន្នន័យដែលប្រើ" + "​ចាត់​ទុកថាមិនផ្អែកតាមទិន្នន័យដែលប្រើ" + +- +- "ប្រើ MAC ចៃដន្យ (លំនាំដើម)" +- "ប្រើ MAC ឧបករណ៍" +- + + "ទេ" + "បាទ/ចាស" +diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml +index e858ca660f..3f1cce11dd 100644 +--- a/res/values-kn/arrays.xml ++++ b/res/values-kn/arrays.xml +@@ -493,10 +493,6 @@ + "ಮೀಟರ್ ಮಾಡಿದೆ ಎಂದು ಪರಿಗಣಿಸಿ" + "ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸಿ" + +- +- "ಯಾದೃಚ್ಛಿಕವಾದ MAC (ಡೀಫಾಲ್ಟ್) ಅನ್ನು ಬಳಸಿ" +- "ಸಾಧನದ MAC ಬಳಸಿ" +- + + "ಇಲ್ಲ" + "ಹೌದು" +diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml +index 8c61c6b50b..27f30fbf06 100644 +--- a/res/values-ko/arrays.xml ++++ b/res/values-ko/arrays.xml +@@ -493,10 +493,6 @@ + "종량제 Wi-Fi로 취급" + "무제한 Wi-Fi로 취급" + +- +- "무작위 MAC 사용(기본값)" +- "기기 MAC 사용" +- + + "아니요" + "예" +diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml +index 0cd420ac62..a8360801e1 100644 +--- a/res/values-ky/arrays.xml ++++ b/res/values-ky/arrays.xml +@@ -493,10 +493,6 @@ + "Ченелет" + "Ченелбейт" + +- +- "Туш келди MAC дарек колдонулат (демейки)" +- "MAC түзмөгүн колдонуу" +- + + "Жок" + "Ооба" +diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml +index 2568a52c76..5f2702b085 100644 +--- a/res/values-lo/arrays.xml ++++ b/res/values-lo/arrays.xml +@@ -493,10 +493,6 @@ + "ໃຊ້ແບບວັດແທກປະລິມານ" + "ໃຊ້ແບບບໍ່ວັດແທກປະລິມານ" + +- +- "ໃຊ້ MAC ແບບສຸ່ມ (ຄ່າເລີ່ມຕົ້ນ)" +- "ໃຊ້ MAC ອຸປະກອນ" +- + + "ບໍ່" + "ແມ່ນ" +diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml +index d423cd5cea..9a7480d938 100644 +--- a/res/values-lt/arrays.xml ++++ b/res/values-lt/arrays.xml +@@ -493,10 +493,6 @@ + "Laikyti matuojamu" + "Laikyti nematuojamu" + +- +- "Naudoti atsitiktine tvarka parinktą MAC (numatyta)" +- "Naudoti įrenginio MAC" +- + + "Ne" + "Taip" +diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml +index f3d5006230..3b8953b0fb 100644 +--- a/res/values-lv/arrays.xml ++++ b/res/values-lv/arrays.xml +@@ -493,10 +493,6 @@ + "Maksas" + "Bezmaksas" + +- +- "Izmantot nejaušā secībā atlasītu MAC adresi (noklusējums)" +- "Izmantot ierīces MAC adresi" +- + + "Nē" + "Jā" +diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml +index 1517863d68..809514238c 100644 +--- a/res/values-mk/arrays.xml ++++ b/res/values-mk/arrays.xml +@@ -493,10 +493,6 @@ + "Сметај како ограничена мрежа" + "Сметај како неограничена мрежа" + +- +- "Користи рандомизирана MAC-адреса (стандардно)" +- "Користи ја MAC-адресата на уредот" +- + + "Не" + "Да" +diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml +index 2edb09ed8e..0623933ea0 100644 +--- a/res/values-ml/arrays.xml ++++ b/res/values-ml/arrays.xml +@@ -493,10 +493,6 @@ + "മീറ്റർ ചെയ്തതായി കണക്കാക്കുക" + "മീറ്റർ ചെയ്യാത്തതായി കണക്കാക്കുക" + +- +- "ക്രമരഹിതമാക്കിയ MAC ഉപയോഗിക്കുക (ഡിഫോൾട്ട്)" +- "ഉപകരണ MAC വിലാസം ഉപയോഗിക്കൂ" +- + + "ഇല്ല" + "ഉവ്വ്" +diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml +index 0c9940e6af..b0f8077c35 100644 +--- a/res/values-mn/arrays.xml ++++ b/res/values-mn/arrays.xml +@@ -493,10 +493,6 @@ + "Хязгаартайгаар тохируулах" + "Хязгааргүйгээр тохируулах" + +- +- "Санамсаргүй үүссэн MAC-г ашиглах (өгөгдмөл)" +- "Төхөөрөмжийн MAC-г ашиглах" +- + + "Үгүй" + "Тийм" +diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml +index 4a25f9e007..b06821c178 100644 +--- a/res/values-mr/arrays.xml ++++ b/res/values-mr/arrays.xml +@@ -493,10 +493,6 @@ + "मर्यादित डेटा वापराचे नेटवर्क" + "अमर्याद डेटा वापराचे नेटवर्क" + +- +- "रँडमाइझ केलेले MAC वापरा (डीफॉल्ट)" +- "डिव्हाइस MAC वापरा" +- + + "नाही" + "होय" +diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml +index 9a9aadc48a..5a9f48c5c8 100644 +--- a/res/values-ms/arrays.xml ++++ b/res/values-ms/arrays.xml +@@ -493,10 +493,6 @@ + "Anggap sebagai bermeter" + "Anggap sebagai tidak bermeter" + +- +- "Gunakan MAC terawak (lalai)" +- "Gunakan MAC peranti" +- + + "Tidak" + "Ya" +diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml +index 60f8af9a28..88bd581d27 100644 +--- a/res/values-my/arrays.xml ++++ b/res/values-my/arrays.xml +@@ -493,10 +493,6 @@ + "အခမဲ့ မဟုတ်သော အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်" + "အခမဲ့ အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်" + +- +- "ကျပန်း MAC ကို အသုံးပြုရန် (မူရင်း)" +- "ကိရိယာ၏ MAC သုံးရန်" +- + + "No" + "Yes" +diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml +index 951578c2c0..8ce027dae4 100644 +--- a/res/values-nb/arrays.xml ++++ b/res/values-nb/arrays.xml +@@ -493,10 +493,6 @@ + "Behandle som med datamåling" + "Behandle som uten datamåling" + +- +- "Bruk tilfeldig MAC-adresse (standard)" +- "Bruk enhetens MAC-adresse" +- + + "Nei" + "Ja" +diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml +index e891c0fbb4..8348ba1a8a 100644 +--- a/res/values-ne/arrays.xml ++++ b/res/values-ne/arrays.xml +@@ -493,10 +493,6 @@ + "सशुल्क वाइफाइका रूपमा लिनुहोस्" + "नि:शुल्क वाइफाइको रूपमा लिनुहोस्" + +- +- "क्रमरहित MAC प्रयोग गर्नुहोस् (पूर्वनिर्धारित)" +- "यन्त्रको MAC प्रयोग गर्नुहोस्" +- + + "होइन" + "हो" +diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml +index 20ac6f3dba..3654b8bbe8 100644 +--- a/res/values-nl/arrays.xml ++++ b/res/values-nl/arrays.xml +@@ -493,10 +493,6 @@ + "Behandelen als wifi met datalimiet" + "Behandelen als wifi zonder datalimiet" + +- +- "Willekeurig MAC-adres gebruiken (standaard)" +- "MAC-adres van apparaat gebruiken" +- + + "Nee" + "Ja" +diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml +index 7bf91931c0..f68bb2470c 100644 +--- a/res/values-or/arrays.xml ++++ b/res/values-or/arrays.xml +@@ -493,10 +493,6 @@ + "ମିଟର୍ ହୋଇଥିବା ରୂପେ ବିବେଚନା କରନ୍ତୁ" + "ମିଟର୍ ହୋଇନଥିବା ରୂପେ ବିବେଚନା କରନ୍ତୁ" + +- +- "ରେଣ୍ଡମାଇଜ୍ MAC ବ୍ୟବହାର କରନ୍ତୁ (ଡିଫଲ୍ଟ)" +- "MAC ଡିଭାଇସ୍ ବ୍ୟବହାର କରନ୍ତୁ" +- + + "ନା" + "ହଁ" +diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml +index dc7a4c34d8..dcb21ecffc 100644 +--- a/res/values-pa/arrays.xml ++++ b/res/values-pa/arrays.xml +@@ -493,10 +493,6 @@ + "ਮੀਟਰਬੱਧ ਮੰਨੋ" + "ਗੈਰ-ਮੀਟਰਬੱਧ ਮੰਨੋ" + +- +- "ਬੇਤਰਤੀਬ MAC (ਪੂਰਵ-ਨਿਰਧਾਰਤ) ਵਰਤੋ" +- "ਡੀਵਾਈਸ MAC ਵਰਤੋ" +- + + "ਨਹੀਂ" + "ਹਾਂ" +diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml +index c2c4ed0f2a..7c1e026dac 100644 +--- a/res/values-pl/arrays.xml ++++ b/res/values-pl/arrays.xml +@@ -493,10 +493,6 @@ + "Traktuj jako sieć z pomiarem użycia danych" + "Traktuj jako sieć bez pomiaru użycia danych" + +- +- "Używaj randomizowanego adresu MAC (domyślnie)" +- "Używaj adresu MAC urządzenia" +- + + "Nie" + "Tak" +diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml +index 389a7d8265..e8133c006d 100644 +--- a/res/values-pt-rBR/arrays.xml ++++ b/res/values-pt-rBR/arrays.xml +@@ -493,10 +493,6 @@ + "Tratar como limitada" + "Tratar como ilimitada" + +- +- "Usar MAC aleatório (padrão)" +- "Usar MAC do dispositivo" +- + + "Não" + "Sim" +diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml +index 319ef23b12..9f712e31b5 100644 +--- a/res/values-pt-rPT/arrays.xml ++++ b/res/values-pt-rPT/arrays.xml +@@ -493,10 +493,6 @@ + "Tratar como acesso limitado" + "Tratar como acesso ilimitado" + +- +- "Utilizar MAC aleatório (predefinição)" +- "Utilizar MAC do dispositivo" +- + + "Não" + "Sim" +diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml +index 389a7d8265..e8133c006d 100644 +--- a/res/values-pt/arrays.xml ++++ b/res/values-pt/arrays.xml +@@ -493,10 +493,6 @@ + "Tratar como limitada" + "Tratar como ilimitada" + +- +- "Usar MAC aleatório (padrão)" +- "Usar MAC do dispositivo" +- + + "Não" + "Sim" +diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml +index e069752b51..bdbdd44aaf 100644 +--- a/res/values-ro/arrays.xml ++++ b/res/values-ro/arrays.xml +@@ -493,10 +493,6 @@ + "Tratează ca fiind contorizată" + "Tratează ca fiind necontorizată" + +- +- "Folosiți o adresă MAC aleatorie (prestabilit)" +- "Folosiți adresa MAC a dispozitivului" +- + + "Nu" + "Da" +diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml +index c78d052c71..8721192709 100644 +--- a/res/values-ru/arrays.xml ++++ b/res/values-ru/arrays.xml +@@ -493,10 +493,6 @@ + "С тарификацией" + "Без тарификации" + +- +- "Случайный MAC-адрес (по умолчанию)" +- "MAC-адрес устройства" +- + + "Нет" + "Да" +diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml +index e67cd3c1b4..e664c59454 100644 +--- a/res/values-si/arrays.xml ++++ b/res/values-si/arrays.xml +@@ -493,10 +493,6 @@ + "මනින ලද ලෙස සලකන්න" + "නොමනින ලද ලෙස සලකන්න" + +- +- "අහඹු කළ MAC භාවිත කරන්න (පෙරනිමි)" +- "MAC උපාංගය භාවිත කරන්න" +- + + "නැත" + "ඔව්" +diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml +index 3c68c3389d..5ed95595e4 100644 +--- a/res/values-sk/arrays.xml ++++ b/res/values-sk/arrays.xml +@@ -493,10 +493,6 @@ + "Považovať za meranú sieť" + "Považovať za nemeranú sieť" + +- +- "Použiť náhodnú MAC (predvolené)" +- "Používať adresu MAC zariadenia" +- + + "Nie" + "Áno" +diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml +index 635df4dfda..b527644575 100644 +--- a/res/values-sl/arrays.xml ++++ b/res/values-sl/arrays.xml +@@ -493,10 +493,6 @@ + "Obravnavaj kot: omejen prenos podatkov" + "Obravnavaj kot: neomejen prenos podatkov" + +- +- "Uporaba naključnega MAC (privzeto)" +- "Uporaba naslova MAC naprave" +- + + "Ne" + "Da" +diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml +index 305b0721a5..fb593d99db 100644 +--- a/res/values-sq/arrays.xml ++++ b/res/values-sq/arrays.xml +@@ -493,10 +493,6 @@ + "Trajto si me matje" + "Trajto si pa matje" + +- +- "Përdor adresë MAC të rastësishme (parazgjedhje)" +- "Përdor adresën MAC të pajisjes" +- + + "Jo" + "Po" +diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml +index 5a3c3407d9..5f40eba5e9 100644 +--- a/res/values-sr/arrays.xml ++++ b/res/values-sr/arrays.xml +@@ -493,10 +493,6 @@ + "Третирај као мрежу са ограничењем" + "Третирај као мрежу без ограничења" + +- +- "Користи насумично изабрану MAC адресу (подразумевано)" +- "Користи MAC адресу уређаја" +- + + "Не" + "Да" +diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml +index ef7ebca8eb..c756bb30a9 100644 +--- a/res/values-sv/arrays.xml ++++ b/res/values-sv/arrays.xml +@@ -493,10 +493,6 @@ + "Behandla som nätverk med datapriser" + "Behandla som nätverk utan datapriser" + +- +- "Använd slumpgenererad MAC-adress (standard)" +- "Använd enhetens MAC-adress" +- + + "Nej" + "Ja" +diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml +index 53006c7a29..830990134e 100644 +--- a/res/values-sw/arrays.xml ++++ b/res/values-sw/arrays.xml +@@ -493,10 +493,6 @@ + "Tumia kama mtandao unaopima data" + "Tumia kama mtandao usiopima data" + +- +- "Anwani ya MAC ya nasibu (chaguomsingi)" +- "Tumia anwani ya MAC ya kifaa" +- + + "Hapana" + "Ndiyo" +diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml +index 737d835e6f..a9da4b013b 100644 +--- a/res/values-ta/arrays.xml ++++ b/res/values-ta/arrays.xml +@@ -493,10 +493,6 @@ + "டேட்டா அளவிடப்பட்டது" + "டேட்டா அளவிடப்படாதது" + +- +- "ரேண்டம் MACகைப் பயன்படுத்து (இயல்புநிலை)" +- "சாதன MACகைப் பயன்படுத்து" +- + + "வேண்டாம்" + "ஆம்" +diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml +index a9a21fc689..340cf6ae48 100644 +--- a/res/values-te/arrays.xml ++++ b/res/values-te/arrays.xml +@@ -493,10 +493,6 @@ + "గణించబడేదానిగా పరిగణించండి" + "గణించబడనిదిగా పరిగణించండి" + +- +- "ర్యాండ‌మ్‌గా రూపొందించిన MAC అడ్రస్‌ను ఉపయోగించండి (ఆటోమేటిక్‌)" +- "పరికర MAC అడ్రస్‌ని ఉపయోగించండి" +- + + "లేదు" + "అవును" +diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml +index d035f21ffe..9167a9c78a 100644 +--- a/res/values-th/arrays.xml ++++ b/res/values-th/arrays.xml +@@ -493,10 +493,6 @@ + "ถือว่ามีการจำกัดปริมาณอินเทอร์เน็ต" + "ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต" + +- +- "ใช้ MAC แบบสุ่ม (ค่าเริ่มต้น)" +- "ใช้ที่อยู่ MAC ของอุปกรณ์" +- + + "ไม่" + "ใช่" +diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml +index a8cef12dcd..56a50606e6 100644 +--- a/res/values-tl/arrays.xml ++++ b/res/values-tl/arrays.xml +@@ -493,10 +493,6 @@ + "Ituring bilang nakametro" + "Ituring bilang hindi nakametro" + +- +- "Gamitin ang na-randomize na MAC (default)" +- "Gamitin ang device MAC" +- + + "Hindi" + "Oo" +diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml +index e193a59ed7..062c1c652b 100644 +--- a/res/values-tr/arrays.xml ++++ b/res/values-tr/arrays.xml +@@ -493,10 +493,6 @@ + "Sınırlı gibi kullan" + "Sınırsız gibi kullan" + +- +- "Rastgele MAC kullan (varsayılan)" +- "Cihazın MAC adresini kullan" +- + + "Hayır" + "Evet" +diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml +index 04f31d6940..6be0cbc325 100644 +--- a/res/values-uk/arrays.xml ++++ b/res/values-uk/arrays.xml +@@ -493,10 +493,6 @@ + "Вважати тарифікованою" + "Вважати нетарифікованою" + +- +- "Використовувати довільну MAC-адресу (за умовчанням)" +- "Використовувати MAC-адресу пристрою" +- + + "Ні" + "Так" +diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml +index cee2d51999..6e5eaea6ad 100644 +--- a/res/values-ur/arrays.xml ++++ b/res/values-ur/arrays.xml +@@ -493,10 +493,6 @@ + "میٹر شدہ کے بطور خیال کریں" + "غیر میٹر شدہ کے بطور خیال کریں" + +- +- "‏بے ترتیب MAC کا استعمال کریں (ڈیفالٹ)" +- "‏آلہ کا MAC استعمال کریں" +- + + "نہیں" + "ہاں" +diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml +index e05793840b..5cd865a6a0 100644 +--- a/res/values-uz/arrays.xml ++++ b/res/values-uz/arrays.xml +@@ -493,10 +493,6 @@ + "Bu – pulli tarmoq" + "Bu – bepul tarmoq" + +- +- "Tasodifiy MAC manzil (standart)" +- "Qurilmaning MAC manzili" +- + + "Yo‘q" + "Ha" +diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml +index 0895ab8ef7..eaf3d4b773 100644 +--- a/res/values-vi/arrays.xml ++++ b/res/values-vi/arrays.xml +@@ -493,10 +493,6 @@ + "Coi như có đo lượng dữ liệu" + "Coi như không đo lượng dữ liệu" + +- +- "Sử dụng MAC ngẫu nhiên (mặc định)" +- "Sử dụng MAC của thiết bị" +- + + "Không" + "Có" +diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml +index bb96438c03..3a04873c2d 100644 +--- a/res/values-zh-rCN/arrays.xml ++++ b/res/values-zh-rCN/arrays.xml +@@ -493,10 +493,6 @@ + "视为按流量计费" + "视为不按流量计费" + +- +- "使用随机 MAC（默认）" +- "使用设备 MAC" +- + + "否" + "是" +diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml +index c4ed3db89b..b436bf9e4a 100644 +--- a/res/values-zh-rHK/arrays.xml ++++ b/res/values-zh-rHK/arrays.xml +@@ -493,10 +493,6 @@ + "視為按用量收費" + "視為非按用量收費" + +- +- "使用隨機 MAC (預設)" +- "使用裝置 MAC" +- + + "否" + "是" +diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml +index ecfa5e6629..d5b9f71ebe 100644 +--- a/res/values-zh-rTW/arrays.xml ++++ b/res/values-zh-rTW/arrays.xml +@@ -493,10 +493,6 @@ + "視為計量付費" + "視為非計量付費" + +- +- "使用隨機化 MAC (預設)" +- "使用裝置 MAC" +- + + "否" + "是" +diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml +index 81a602b4fb..c2d2bf1298 100644 +--- a/res/values-zu/arrays.xml ++++ b/res/values-zu/arrays.xml +@@ -493,10 +493,6 @@ + "Phatha njengokulinganisiwe" + "Phatha njengokungalinganisiwe" + +- +- "Sebenzisa i-MAC engahleliwe (okuzenzakalelayo)" +- "Sebenzisa i-MAC yedivayisi" +- + + "Cha" + "Yebo" diff --git a/Patches/LineageOS-18.1/android_packages_modules_NetworkStack/0001-Random_MAC.patch b/Patches/LineageOS-18.1/android_packages_modules_NetworkStack/0001-Random_MAC.patch new file mode 100644 index 00000000..66dbfb3f --- /dev/null +++ b/Patches/LineageOS-18.1/android_packages_modules_NetworkStack/0001-Random_MAC.patch @@ -0,0 +1,71 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Pratyush <39559233+empratyush@users.noreply.github.com> +Date: Thu, 20 May 2021 13:21:31 +0530 +Subject: [PATCH] avoid reusing DHCP state for full MAC randomization + +--- + src/android/net/dhcp/DhcpClient.java | 30 +++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java +index 4fedf308..5b613a2a 100644 +--- a/src/android/net/dhcp/DhcpClient.java ++++ b/src/android/net/dhcp/DhcpClient.java +@@ -74,6 +74,9 @@ import android.net.util.InterfaceParams; + import android.net.util.NetworkStackUtils; + import android.net.util.PacketReader; + import android.net.util.SocketUtils; ++import android.net.wifi.WifiConfiguration; ++import android.net.wifi.WifiInfo; ++import android.net.wifi.WifiManager; + import android.os.Build; + import android.os.Handler; + import android.os.Message; +@@ -111,6 +114,8 @@ import java.net.SocketAddress; + import java.net.SocketException; + import java.nio.ByteBuffer; + import java.util.Arrays; ++import java.util.ArrayList; ++import java.util.List; + import java.util.Random; + + /** +@@ -1198,7 +1203,7 @@ public class DhcpClient extends StateMachine { + + " lease expiry: " + attributes.assignedV4AddressExpiry + + " current time: " + currentTime); + } +- if (currentTime >= attributes.assignedV4AddressExpiry) { ++ if (currentTime >= attributes.assignedV4AddressExpiry || shouldAvoidStateReuse()) { + // Lease has expired. + transitionTo(mDhcpInitState); + return HANDLED; +@@ -1223,6 +1228,29 @@ public class DhcpClient extends StateMachine { + } + } + ++ private static final int RANDOMIZATION_ALWAYS = 100; ++ ++ private boolean shouldAvoidStateReuse() { ++ try { ++ WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); ++ WifiInfo wifiInfo = wifiManager.getConnectionInfo(); ++ if (wifiInfo != null) { ++ int connectedNetworkId = wifiInfo.getNetworkId(); ++ List configurationList = wifiManager.getConfiguredNetworks(); ++ for (WifiConfiguration configuration : configurationList){ ++ if (configuration.networkId == connectedNetworkId){ ++ return configuration.macRandomizationSetting == RANDOMIZATION_ALWAYS; ++ } ++ } ++ } ++ } catch (Exception e) { ++ loge(e.getLocalizedMessage(), e); ++ } ++ ++ loge("ConfiguredNetworks should contain Connected network id config"); ++ return true; ++ } ++ + private void receiveOfferOrAckPacket(final DhcpPacket packet, final boolean acceptRapidCommit) { + if (!isValidPacket(packet)) return; + diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 77992d95..0ad030c9 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -171,6 +171,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0016-Bluetooth_Timeout.patch"; applyPatch "$DOS_PATCHES/android_frameworks_base/0017-WiFi_Timeout.patch"; #Timeout for Wi-Fi (GrapheneOS) fi; if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0018-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS) +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0019-Random_MAC.patch"; fi; #Add option of always randomizing MAC addresses (GrapheneOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0006-Do-not-throw-in-setAppOnInterfaceLocked.patch"; #Fix random reboots on broken kernels when an app has data restricted XXX: ugly if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0002-Signature_Spoofing.patch"; fi; #Allow packages to spoof their signature (microG) if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0003-Harden_Sig_Spoofing.patch"; fi; #Restrict signature spoofing to system apps signed with the platform key @@ -200,6 +201,7 @@ fi; if enterAndClear "frameworks/opt/net/wifi"; then if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS) +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0002-Random_MAC.patch"; fi; #Add support for always generating new random MAC (GrapheneOS) fi; if enterAndClear "hardware/qcom/display"; then @@ -299,6 +301,10 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0007-WiFi_Timeout.patch" fi; if [ "$DOS_GRAPHENE_PTRACE_SCOPE" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; fi; #Add native debugging setting (GrapheneOS) if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS) +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-Random_MAC-1.patch"; #Add option to always randomize MAC (GrapheneOS) +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-Random_MAC-2.patch"; #Remove partial MAC randomization translations (GrapheneOS) +fi; sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase max password length (GrapheneOS) sed -i 's/if (isFullDiskEncrypted()) {/if (false) {/' src/com/android/settings/accessibility/*AccessibilityService*.java; #Never disable secure start-up when enabling an accessibility service if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/backup/PrivacySettingsUtils.java; fi; #microG doesn't support Backup, hide the options @@ -324,6 +330,12 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0001-Voic applyPatch "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0002-Disable_Personalization.patch"; #Disable personalization dictionary by default (GrapheneOS) fi; +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then +if enterAndClear "packages/modules/NetworkStack"; then +applyPatch "$DOS_PATCHES/android_packages_modules_NetworkStack/0001-Random_MAC.patch"; #Avoid reusing DHCP state for full MAC randomization (GrapheneOS) +fi; +fi; + if enterAndClear "packages/providers/DownloadProvider"; then if [ "$DOS_GRAPHENE_NETWORK_PERM" = true ]; then applyPatch "$DOS_PATCHES/android_packages_providers_DownloadProvider/0001-Network_Permission.patch"; fi; #Expose the NETWORK permission (GrapheneOS) fi; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index a42683bc..7fd6eefd 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -163,6 +163,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-11.pat applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-12.patch"; sed -i 's/sys.spawn.exec/persist.security.exec_spawn/' core/java/com/android/internal/os/ZygoteConnection.java; fi; +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0019-Random_MAC.patch"; fi; #Add option of always randomizing MAC addresses (GrapheneOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0006-Do-not-throw-in-setAppOnInterfaceLocked.patch"; #Fix random reboots on broken kernels when an app has data restricted XXX: ugly if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0002-Signature_Spoofing.patch"; fi; #Allow packages to spoof their signature (microG) if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0003-Harden_Sig_Spoofing.patch"; fi; #Restrict signature spoofing to system apps signed with the platform key @@ -196,6 +197,12 @@ applyPatch "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; fi; fi; +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then +if enterAndClear "frameworks/opt/net/wifi"; then +applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS) +fi; +fi; + if enterAndClear "hardware/qcom/display"; then applyPatch "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm8084.patch" --directory="msm8084"; applyPatch "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm8916.patch" --directory="msm8226"; @@ -304,6 +311,10 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0007-WiFi_Timeout.patch" fi; if [ "$DOS_GRAPHENE_PTRACE_SCOPE" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; fi; #Add native debugging setting (GrapheneOS) if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS) +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-Random_MAC-1.patch"; #Add option to always randomize MAC (GrapheneOS) +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-Random_MAC-2.patch"; #Remove partial MAC randomization translations (GrapheneOS) +fi; applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-Install_Restrictions.patch"; #UserManager app installation restrictions (GrapheneOS) sed -i 's/if (isFullDiskEncrypted()) {/if (false) {/' src/com/android/settings/accessibility/*AccessibilityService*.java; #Never disable secure start-up when enabling an accessibility service if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/backup/PrivacySettingsUtils.java; fi; #microG doesn't support Backup, hide the options @@ -329,6 +340,12 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0001-Voic applyPatch "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0002-Disable_Personalization.patch"; #Disable personalization dictionary by default (GrapheneOS) fi; +if [ "$DOS_GRAPHENE_RANDOM_MAC" = true ]; then +if enterAndClear "packages/modules/NetworkStack"; then +applyPatch "$DOS_PATCHES/android_packages_modules_NetworkStack/0001-Random_MAC.patch"; #Avoid reusing DHCP state for full MAC randomization (GrapheneOS) +fi; +fi; + if enterAndClear "packages/providers/DownloadProvider"; then if [ "$DOS_GRAPHENE_NETWORK_PERM" = true ]; then applyPatch "$DOS_PATCHES/android_packages_providers_DownloadProvider/0001-Network_Permission.patch"; fi; #Expose the NETWORK permission (GrapheneOS) fi; diff --git a/Scripts/init.sh b/Scripts/init.sh index 624987c3..0f74b141 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -61,8 +61,9 @@ export DOS_GRAPHENE_BIONIC=true; #Enables the bionic hardening patchset on 16.0+ export DOS_GRAPHENE_CONSTIFY=true; #Enables 'Constify JNINativeMethod tables' patchset on 16.0+17.1+18.1 export DOS_GRAPHENE_MALLOC=true; #Enables use of GrapheneOS' hardened memory allocator on 64-bit platforms on 16.0+17.1+18.1 export DOS_GRAPHENE_EXEC=true; #Enables use of GrapheneOS' exec spawning feature on 16.0+17.1+18.1 -export DOS_GRAPHENE_PTRACE_SCOPE=true; #Enables the ptrace_scope toggle patchset on 17.1+18.1 +export DOS_GRAPHENE_PTRACE_SCOPE=true; #Enables the GrapheneOS ptrace_scope toggle patchset on 17.1+18.1 export DOS_GRAPHENE_NETWORK_PERM=true; #Enables use of GrapheneOS' NETWORK permission on 17.1+18.1 +export DOS_GRAPHENE_RANDOM_MAC=true; #Enables the GrapheneOS always randomize Wi-Fi MAC patchset on 17.1+18.1 export DOS_TIMEOUTS=true; #Enables the GrapheneOS/CalyxOS patchset for automatic timeouts of reboot/Wi-Fi/Bluetooth on 17.1+18.1 export DOS_HOSTS_BLOCKING=true; #Set false to prevent inclusion of a HOSTS file export DOS_HOSTS_BLOCKING_APP="DNS66"; #App installed when built-in blocking is disabled. Options: DNS66