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

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

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-15 05:44:24 +00:00
committed by Android (Google) Code Review
parent 22c4a1e955 a6861564b5
commit b9972035bb
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -1068,6 +1068,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
@VisibleForTesting @VisibleForTesting
void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) { void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) {
final WifiEntry wifiEntry = pref.getWifiEntry(); 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 Context context = requireContext();
final Bundle bundle = new Bundle(); final Bundle bundle = new Bundle();

11
tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
View File

@@ -872,6 +872,17 @@ public class NetworkProviderSettingsTest {
verify(mWifiEntry, never()).getKey(); 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) @Implements(PreferenceFragmentCompat.class)
public static class ShadowPreferenceFragmentCompat { public static class ShadowPreferenceFragmentCompat {