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

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

Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev

parents 2082b28c 6629b12a

src/com/android/settings/network/NetworkProviderSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    @VisibleForTesting

    void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {

        if (mIsRestricted) {

            Log.e(TAG, "Can't configure Wi-Fi because NetworkProviderSettings is restricted.");

            EventLog.writeEvent(0x534e4554, "246301667", -1 /* UID */, "Fragment is restricted.");

            return;

        }



        final Bundle bundle = new Bundle();

        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY,

                wifiEntry.getKey());

tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java

+9 −0
Original line number Diff line number Diff line
@@ -751,6 +751,15 @@ public class NetworkProviderSettingsTest { 
        assertThat(keys).contains(NetworkProviderSettings.PREF_KEY_WIFI_TOGGLE);

    }



    @Test

    public void launchConfigNewNetworkFragment_fragmentIsRestricted_ignoreWifiEntry() {

        mNetworkProviderSettings.mIsRestricted = true;



        mNetworkProviderSettings.launchConfigNewNetworkFragment(mWifiEntry);



        verify(mWifiEntry, never()).getKey();

    }



    @Implements(PreferenceFragmentCompat.class)

    public static class ShadowPreferenceFragmentCompat {