PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Rename Enhanced MAC Randomization to Non-Persistent""

Browse Source
This commit is contained in:
Quang Luong
2021-07-13 15:45:51 +00:00
committed by Android (Google) Code Review
parent 09d1003fce e7cb2762f9
commit 373b7cb089
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -505,7 +505,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new WifiDisplayCertificationPreferenceController(context));
controllers.add(new WifiVerboseLoggingPreferenceController(context));
controllers.add(new WifiScanThrottlingPreferenceController(context));
controllers.add(new WifiNonPersistentMacRandomizationPreferenceController(context));
controllers.add(new WifiEnhancedMacRandomizationPreferenceController(context));
controllers.add(new MobileDataAlwaysOnPreferenceController(context));
controllers.add(new TetheringHardwareAccelPreferenceController(context));
controllers.add(new BluetoothDeviceNoNamePreferenceController(context));

22
src/com/android/settings/development/WifiNonPersistentMacRandomizationPreferenceController.java → src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceController.java
View File

@@ -26,30 +26,30 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
/**
* Developer option controller for non-persistent MAC randomization.
* Developer option controller for enhanced MAC randomization.
*/
public class WifiNonPersistentMacRandomizationPreferenceController
public class WifiEnhancedMacRandomizationPreferenceController
extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String WIFI_NON_PERSISTENT_MAC_RANDOMIZATION_KEY =
"wifi_non_persistent_mac_randomization";
private static final String NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG =
"non_persistent_mac_randomization_force_enabled";
private static final String WIFI_ENHANCED_MAC_RANDOMIZATION_KEY =
"wifi_enhanced_mac_randomization";
private static final String ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG =
"enhanced_mac_randomization_force_enabled";
public WifiNonPersistentMacRandomizationPreferenceController(Context context) {
public WifiEnhancedMacRandomizationPreferenceController(Context context) {
super(context);
}
@Override
public String getPreferenceKey() {
return WIFI_NON_PERSISTENT_MAC_RANDOMIZATION_KEY;
return WIFI_ENHANCED_MAC_RANDOMIZATION_KEY;
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
int isEnabledInt = ((Boolean) newValue) ? 1 : 0;
Settings.Global.putInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, isEnabledInt);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, isEnabledInt);
return true;
}
@@ -57,7 +57,7 @@ public class WifiNonPersistentMacRandomizationPreferenceController
public void updateState(Preference preference) {
boolean enabled = false;
if (Settings.Global.getInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 0) == 1) {
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 0) == 1) {
enabled = true;
}
((SwitchPreference) mPreference).setChecked(enabled);
@@ -67,7 +67,7 @@ public class WifiNonPersistentMacRandomizationPreferenceController
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
((SwitchPreference) mPreference).setChecked(false);
}
}

24
tests/robotests/src/com/android/settings/development/WifiNonPersistentMacRandomizationPreferenceControllerTest.java → tests/robotests/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceControllerTest.java
View File

@@ -36,48 +36,48 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class WifiNonPersistentMacRandomizationPreferenceControllerTest {
private static final String NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG =
"non_persistent_mac_randomization_force_enabled";
public class WifiEnhancedMacRandomizationPreferenceControllerTest {
private static final String ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG =
"enhanced_mac_randomization_force_enabled";
@Mock
private SwitchPreference mPreference;
@Mock
private PreferenceScreen mPreferenceScreen;
private Context mContext;
private WifiNonPersistentMacRandomizationPreferenceController mController;
private WifiEnhancedMacRandomizationPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new WifiNonPersistentMacRandomizationPreferenceController(mContext);
mController = new WifiEnhancedMacRandomizationPreferenceController(mContext);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@Test
public void onPreferenceChanged_enabled_shouldTurnOnNonPersistentRandomization() {
public void onPreferenceChanged_enabled_shouldTurnOnEnhancedRandomization() {
mController.onPreferenceChange(mPreference, true /* new value */);
int mode = Settings.Global.getInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
assertThat(mode).isEqualTo(1);
}
@Test
public void onPreferenceChanged_disabled_shouldTurnOffNonPersistentRandomization() {
public void onPreferenceChanged_disabled_shouldTurnOffEnhancedRandomization() {
mController.onPreferenceChange(mPreference, false /* new value */);
int mode = Settings.Global.getInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
assertThat(mode).isEqualTo(0);
}
@Test
public void updateState_preferenceShouldBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 1);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -86,7 +86,7 @@ public class WifiNonPersistentMacRandomizationPreferenceControllerTest {
@Test
public void updateState_preferenceShouldNotBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -97,7 +97,7 @@ public class WifiNonPersistentMacRandomizationPreferenceControllerTest {
mController.onDeveloperOptionsSwitchDisabled();
int mode = Settings.Global.getInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
assertThat(mode).isEqualTo(0);
assertThat(mPreference.isChecked()).isFalse();