Merge "Fix Wi-Fi details crash in secondary users" into main (d8b1e294) · Commits · e / os / android_packages_apps_Settings

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -400,6 +400,9 @@ public class WifiNetworkDetailsFragment extends RestrictedDashboardFragment impl

		@VisibleForTesting
		void onHotspotNetworkChanged(WifiNetworkDetailsViewModel.HotspotNetworkData data) {
		if (mIsUiRestricted) {
		return;
		}
		PreferenceScreen screen = getPreferenceScreen();
		if (screen == null) {
		return;

+10 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MAX;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.doReturn;
		@@ -246,6 +247,15 @@ public class WifiNetworkDetailsFragmentTest {
		.setSignalStrengthTitle(R.string.hotspot_connection_strength);
		}

		@Test
		public void onHotspotNetworkChanged_uiRestricted_doNothing() {
		mFragment.mIsUiRestricted = true;

		mFragment.onHotspotNetworkChanged(null /* HotspotNetworkData */);

		verify(mScreen, never()).findPreference(any());
		}

		@Test
		public void updateInternetSource_networkTypeWifi_setWifiResource() {
		doReturn(mDrawable).when(mContext)