Merge "Wifi MAC Randomization: Developer Options" (0784111c) · Commits · e / os / android_packages_apps_Settings

res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,10 @@
		<!-- 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

+5 −0

Original line number	Diff line number	Diff line
		@@ -202,6 +202,11 @@
		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

+1 −0

Original line number	Diff line number	Diff line
		@@ -398,6 +398,7 @@ 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 SelectUsbConfigPreferenceController(context, lifecycle));

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

0 → 100644

+93 −0

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 android.support.annotation.VisibleForTesting;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;

		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;

		private SwitchPreference mPreference;

		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 void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
		}

		@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);
		mPreference.setChecked(enableMode != SETTING_VALUE_OFF);
		}

		@Override
		protected void onDeveloperOptionsSwitchEnabled() {
		mPreference.setEnabled(true);
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);
		mPreference.setChecked(false);
		mPreference.setEnabled(false);
		}
		}

tests/robotests/res/values-mcc999/config.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -54,4 +54,5 @@
		<bool name="config_show_vibrate_input_devices">false</bool>
		<bool name="config_show_color_correction_preference">false</bool>
		<bool name="config_show_color_inversion_preference">false</bool>
		<bool name="config_wifi_support_connected_mac_randomization">false</bool>
		</resources>