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

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

Merge "Avoid launching details settings after WifiEntry is forgotten" into main

parents 22c4a1e9 a6861564

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

+4 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
    @VisibleForTesting

    void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) {

        final WifiEntry wifiEntry = pref.getWifiEntry();

        if (!wifiEntry.isSaved()) {

            Log.w(TAG, "launchNetworkDetailsFragment: Don't launch because WifiEntry isn't saved!");

            return;

        }

        final Context context = requireContext();



        final Bundle bundle = new Bundle();

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

+11 −0
Original line number Diff line number Diff line
@@ -872,6 +872,17 @@ public class NetworkProviderSettingsTest { 
        verify(mWifiEntry, never()).getKey();

    }



    @Test

    public void launchNetworkDetailsFragment_wifiEntryIsNotSaved_ignoreWifiEntry() {

        when(mWifiEntry.isSaved()).thenReturn(false);

        LongPressWifiEntryPreference preference =

                mNetworkProviderSettings.createLongPressWifiEntryPreference(mWifiEntry);



        mNetworkProviderSettings.launchNetworkDetailsFragment(preference);



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

    }



    @Implements(PreferenceFragmentCompat.class)

    public static class ShadowPreferenceFragmentCompat {