Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa4748d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 306d3fc1 fb6b71e2

src/com/android/settings/core/FeatureFlags.java

+0 −1
Original line number Diff line number Diff line
@@ -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";

src/com/android/settings/wifi/WifiConfigController.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }

src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java

+3 −2
Original line number Diff line number Diff line
@@ -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