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

Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: a4b5ecc5f9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ic674efa0599fb80487d1af4bfcd0c8030092365a
This commit is contained in:
TreeHugger Robot
2021-06-23 10:47:33 +00:00
committed by Automerger Merge Worker
parent ebfc6df5f5 a4b5ecc5f9
commit 1777344309
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -535,4 +535,32 @@ public class NetworkProviderSettingsTest {
assertThat(p instanceof NetworkProviderSettings.FirstWifiEntryPreference).isTrue();
}
@Test
public void updateWifiEntryPreferences_activityIsNull_ShouldNotCrash() {
when(mNetworkProviderSettings.getActivity()).thenReturn(null);
// should not crash
mNetworkProviderSettings.updateWifiEntryPreferences();
}
@Test
public void updateWifiEntryPreferences_viewIsNull_ShouldNotCrash() {
final FragmentActivity activity = mock(FragmentActivity.class);
when(mNetworkProviderSettings.getActivity()).thenReturn(activity);
when(mNetworkProviderSettings.getView()).thenReturn(null);
// should not crash
mNetworkProviderSettings.updateWifiEntryPreferences();
}
@Test
public void updateWifiEntryPreferences_isRestricted_bypassUpdate() {
mNetworkProviderSettings.mIsRestricted = true;
mNetworkProviderSettings.mWifiEntryPreferenceCategory = mock(PreferenceCategory.class);
mNetworkProviderSettings.updateWifiEntryPreferences();
verify(mNetworkProviderSettings.mWifiEntryPreferenceCategory, never()).setVisible(true);
}
}