Merge "[Provider Model] Fix settings crash issue" into sc-dev (f396c0af) · Commits · e / os / android_packages_apps_Settings

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
		import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
		import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

		import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY;
		import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
		import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;

		@@ -191,6 +192,12 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
		mContext.unregisterReceiver(mWifiStateReceiver);
		}

		/** @OnLifecycleEvent(ON_DESTROY) */
		@OnLifecycleEvent(ON_DESTROY)
		public void onDestroy() {
		mAirplaneModeEnabler.close();
		}

		@Override
		public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
		fetchActiveNetwork();

+7 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,13 @@ public class InternetUpdaterTest {
		any(ConnectivityManager.NetworkCallback.class));
		}

		@Test
		public void onDestroy_shouldCloseCallback() {
		mInternetUpdater.onDestroy();

		verify(mAirplaneModeEnabler).close();
		}

		@Test
		public void updateInternetAvailable_wifiConnectedAndNoValidated_internetUnavailable() {
		final NetworkCapabilities networkCapabilities = new NetworkCapabilities.Builder()