From fb6b71e2d3ff7913367ae760dba288f664e371ad Mon Sep 17 00:00:00 2001 From: cosmohsieh Date: Fri, 8 Mar 2019 13:38:27 +0800 Subject: [PATCH] [MAC Randomization] Align feature flag to global flag as framework Removed feature flag and change to check global flag as framework MAC randomization api does. Bug: 127817791 Test: atest WifiPrivacyPreferenceControllerTest Change-Id: I6d5f67d45c9bdbfb47cddfc402d13627dc5a8a6e --- src/com/android/settings/core/FeatureFlags.java | 1 - src/com/android/settings/wifi/WifiConfigController.java | 4 ++-- .../wifi/details/WifiPrivacyPreferenceController.java | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java index f2ffe2255ea..6c2da07d0a9 100644 --- a/src/com/android/settings/core/FeatureFlags.java +++ b/src/com/android/settings/core/FeatureFlags.java @@ -23,7 +23,6 @@ public class FeatureFlags { 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 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 SLICE_INJECTION = "settings_slice_injection"; public static final String MAINLINE_MODULE = "settings_mainline_module"; diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index e7db5db9b81..916d3305017 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -248,8 +248,8 @@ public class WifiConfigController implements TextWatcher, mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings); mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings); mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings); - if (FeatureFlagUtils.isEnabled(mContext, - com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) { + if (mContext.getResources().getBoolean( + com.android.internal.R.bool.config_wifi_p2p_mac_randomization_supported)) { View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields); privacySettingsLayout.setVisibility(View.VISIBLE); } diff --git a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java index b79f2d49749..97ddc531167 100644 --- a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java @@ -58,8 +58,9 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im @Override public int getAvailabilityStatus() { - return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.WIFI_MAC_RANDOMIZATION) - ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + return mContext.getResources().getBoolean( + com.android.internal.R.bool.config_wifi_p2p_mac_randomization_supported) ? + AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @Override