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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-09 00:25:44 +00:00
committed by Android (Google) Code Review
parent 306d3fc165 fb6b71e2d3
commit aa4748d0a1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
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);
}

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

@@ -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