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

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

Revert "Wifi MAC Randomization: Developer Options" 

This reverts commit 8c6d8daa.

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

Bug: 123408542
Test: unit tests
Test: Manual test to verify dev option is gone
Change-Id: Iae667a331b5d4fb4cb6fe07077eb9f3954f3089e
parent 8167b658

res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ 
    <!-- Whether to show Camera laser sensor switch in Developer Options -->

    <bool name="config_show_camera_laser_sensor">false</bool>



    <!-- Whether to show Connected MAC Randomization in Developer Options

         as not all devices can support dynamic MAC address change.  -->

    <bool name="config_wifi_support_connected_mac_randomization">false</bool>



    <!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->

    <string name="config_featureFactory" translatable="false">com.android.settings.overlay.FeatureFactoryImpl</string>

res/xml/development_settings.xml

+0 −5
Original line number Diff line number Diff line
@@ -221,11 +221,6 @@ 
            android:title="@string/wifi_verbose_logging"

            android:summary="@string/wifi_verbose_logging_summary" />



        <SwitchPreference

            android:key="wifi_connected_mac_randomization"

            android:title="@string/wifi_connected_mac_randomization"

            android:summary="@string/wifi_connected_mac_randomization_summary" />



        <SwitchPreference

            android:key="mobile_data_always_on"

            android:title="@string/mobile_data_always_on"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new CameraLaserSensorPreferenceController(context));

        controllers.add(new WifiDisplayCertificationPreferenceController(context));

        controllers.add(new WifiVerboseLoggingPreferenceController(context));

        controllers.add(new WifiConnectedMacRandomizationPreferenceController(context));

        controllers.add(new MobileDataAlwaysOnPreferenceController(context));

        controllers.add(new TetheringHardwareAccelPreferenceController(context));

        controllers.add(new BluetoothDeviceNoNamePreferenceController(context));

src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.development;



import android.content.Context;

import android.provider.Settings;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.SwitchPreference;



import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



public class WifiConnectedMacRandomizationPreferenceController extends

        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,

        PreferenceControllerMixin {



    private static final String WIFI_CONNECTED_MAC_RANDOMIZATION_KEY =

            "wifi_connected_mac_randomization";



    @VisibleForTesting

    static final int SETTING_VALUE_ON = 1;

    @VisibleForTesting

    static final int SETTING_VALUE_OFF = 0;



    public WifiConnectedMacRandomizationPreferenceController(Context context) {

        super(context);

    }



    @Override

    public boolean isAvailable() {

        return mContext.getResources().getBoolean(

                R.bool.config_wifi_support_connected_mac_randomization);

    }



    @Override

    public String getPreferenceKey() {

        return WIFI_CONNECTED_MAC_RANDOMIZATION_KEY;

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        final boolean isEnabled = (Boolean) newValue;

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED,

                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        final int enableMode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);

        ((SwitchPreference) mPreference).setChecked(enableMode != SETTING_VALUE_OFF);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        super.onDeveloperOptionsSwitchDisabled();

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);

        ((SwitchPreference) mPreference).setChecked(false);

    }

}

src/com/android/settings/wifi/WifiInfoPreferenceController.java

+3 −4
Original line number Diff line number Diff line
@@ -98,12 +98,11 @@ public class WifiInfoPreferenceController extends AbstractPreferenceController 
    public void updateWifiInfo() {

        if (mWifiMacAddressPref != null) {

            final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();

            final int macRandomizationMode = Settings.Global.getInt(mContext.getContentResolver(),

                    Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, 0);

            final boolean macRandomizationSupported = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_wifi_connected_mac_randomization_supported);

            final String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();



            if (macRandomizationMode == 1

                    && WifiInfo.DEFAULT_MAC_ADDRESS.equals(macAddress)) {

            if (macRandomizationSupported && WifiInfo.DEFAULT_MAC_ADDRESS.equals(macAddress)) {

                mWifiMacAddressPref.setSummary(R.string.wifi_status_mac_randomized);

            } else if (TextUtils.isEmpty(macAddress)

                    || WifiInfo.DEFAULT_MAC_ADDRESS.equals(macAddress)) {