Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca823585 authored by Oscar Shu's avatar Oscar Shu Committed by xshu
Browse files

Revert "Wifi MAC Randomization: Developer option change global settings" 

This reverts commit 0a20eda5.

Reason for revert: Enabling feature by default. Global flag moved to OEM configurable overlay instead

Bug: 123408542
Test: unit tests
Test: Manually verify developer option is gone

Change-Id: I34bfedba786e53426a941ad12ea7c7b119987420
parent 97bd994b

core/java/android/provider/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -10470,8 +10470,10 @@ public final class Settings { 
        /**

         * Setting to enable connected MAC randomization in Wi-Fi; disabled by default, and

         * setting to 1 will enable it. In the future, additional values may be supported.

         * @deprecated MAC randomization is now a per-network setting

         * @hide

         */

        @Deprecated

        public static final String WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED =

                "wifi_connected_mac_randomization_enabled";

































core/proto/android/providers/settings/global.proto



+1
−1




























Original line number
Diff line number
Diff line








@@ -1004,7 +1004,7 @@ message GlobalSettingsProto {













        optional SettingProto watchdog_poor_network_test_enabled = 22 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto suspend_optimizations_enabled = 23 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto verbose_logging_enabled = 24 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto connected_mac_randomization_enabled = 25 [ (android.privacy).dest = DEST_AUTOMATIC ];













        reserved 25; // connected_mac_randomization_enabled















        optional SettingProto max_dhcp_retry_count = 26 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto mobile_data_transition_wakelock_timeout_ms = 27 [ (android.privacy).dest = DEST_AUTOMATIC ];















        // Controls whether WiFi configurations created by a Device Owner app should

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -507,7 +507,6 @@ public class SettingsBackupTest {













                    Settings.Global.WIFI_ALWAYS_REQUESTED,















                    Settings.Global.WIFI_BADGING_THRESHOLDS,















                    Settings.Global.WIFI_BOUNCE_DELAY_OVERRIDE_MS,













                    Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED,















                    Settings.Global.WIFI_COUNTRY_CODE,















                    Settings.Global.WIFI_DATA_STALL_MIN_TX_BAD,















                    Settings.Global.WIFI_DATA_STALL_MIN_TX_SUCCESS_WITHOUT_RX,

































packages/SettingsLib/res/values/strings.xml



+0
−4




























Original line number
Diff line number
Diff line








@@ -616,8 +616,6 @@













    <string name="wifi_display_certification">Wireless display certification</string>















    <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->















    <string name="wifi_verbose_logging">Enable Wi\u2011Fi Verbose Logging</string>













    <!-- Setting Checkbox title whether to enable connected MAC randomization -->













    <string name="wifi_connected_mac_randomization">Connected MAC Randomization</string>















    <!-- Setting Checkbox title whether to always keep mobile data active. [CHAR LIMIT=80] -->















    <string name="mobile_data_always_on">Mobile data always active</string>















    <!-- Setting Checkbox title whether to enable hardware acceleration for tethering. [CHAR LIMIT=80] -->










@@ -673,8 +671,6 @@













    <string name="wifi_display_certification_summary">Show options for wireless display certification</string>















    <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->















    <string name="wifi_verbose_logging_summary">Increase Wi\u2011Fi logging level, show per SSID RSSI in Wi\u2011Fi Picker</string>













    <!-- Setting Checkbox title whether to enable connected MAC randomization -->













    <string name="wifi_connected_mac_randomization_summary">Randomize MAC address when connecting to Wi\u2011Fi networks</string>















    <!-- Label indicating network has been manually marked as metered -->















    <string name="wifi_metered_label">Metered</string>















    <!-- Label indicating network has been manually marked as unmetered -->

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -1516,9 +1516,6 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED,















                GlobalSettingsProto.Wifi.VERBOSE_LOGGING_ENABLED);













        dumpSetting(s, p,













                Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED,













                GlobalSettingsProto.Wifi.CONNECTED_MAC_RANDOMIZATION_ENABLED);















        dumpSetting(s, p,















                Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT,















                GlobalSettingsProto.Wifi.MAX_DHCP_RETRY_COUNT);