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

[MAC Randomization] Align feature flag to global flag as framework

Browse Source 
Removed feature flag and change to check global flag as framework MAC
randomization api does.

Bug: 127817791
Test: atest WifiPrivacyPreferenceControllerTest
Change-Id: I6d5f67d45c9bdbfb47cddfc402d13627dc5a8a6e
This commit is contained in:
cosmohsieh
2019-03-08 13:38:27 +08:00
parent 457f9a6ee8
commit fb6b71e2d3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/core/FeatureFlags.java
View File

@@ -23,7 +23,6 @@ public class FeatureFlags {
public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher"; public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2"; public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";
public static final String WIFI_MAC_RANDOMIZATION = "settings_wifi_mac_randomization";
public static final String NETWORK_INTERNET_V2 = "settings_network_and_internet_v2"; public static final String NETWORK_INTERNET_V2 = "settings_network_and_internet_v2";
public static final String SLICE_INJECTION = "settings_slice_injection"; public static final String SLICE_INJECTION = "settings_slice_injection";
public static final String MAINLINE_MODULE = "settings_mainline_module"; public static final String MAINLINE_MODULE = "settings_mainline_module";

4
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -248,8 +248,8 @@ public class WifiConfigController implements TextWatcher,
mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings); mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings); mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings); mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings);
if (FeatureFlagUtils.isEnabled(mContext, if (mContext.getResources().getBoolean(
com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) { com.android.internal.R.bool.config_wifi_p2p_mac_randomization_supported)) {
View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields); View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields);
privacySettingsLayout.setVisibility(View.VISIBLE); privacySettingsLayout.setVisibility(View.VISIBLE);
} }

5
src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
View File

@@ -58,8 +58,9 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.WIFI_MAC_RANDOMIZATION) return mContext.getResources().getBoolean(
? AVAILABLE : CONDITIONALLY_UNAVAILABLE; com.android.internal.R.bool.config_wifi_p2p_mac_randomization_supported) ?
AVAILABLE : CONDITIONALLY_UNAVAILABLE;
} }
@Override @Override