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

Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28

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

Change-Id: Ia521623543a767b5cd4bce0132e5d033b265a229
This commit is contained in:
TreeHugger Robot
2021-05-06 02:33:01 +00:00
committed by Automerger Merge Worker
parent d2c87251c5 f396c0af28
commit a59fe14784
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/InternetUpdater.java
View File

@@ -20,6 +20,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET; import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI; 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_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
@@ -191,6 +192,12 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
mContext.unregisterReceiver(mWifiStateReceiver); mContext.unregisterReceiver(mWifiStateReceiver);
} }
/** @OnLifecycleEvent(ON_DESTROY) */
@OnLifecycleEvent(ON_DESTROY)
public void onDestroy() {
mAirplaneModeEnabler.close();
}
@Override @Override
public void onAirplaneModeChanged(boolean isAirplaneModeOn) { public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
fetchActiveNetwork(); fetchActiveNetwork();

7
tests/unit/src/com/android/settings/network/InternetUpdaterTest.java
View File

@@ -107,6 +107,13 @@ public class InternetUpdaterTest {
any(ConnectivityManager.NetworkCallback.class)); any(ConnectivityManager.NetworkCallback.class));
} }
@Test
public void onDestroy_shouldCloseCallback() {
mInternetUpdater.onDestroy();
verify(mAirplaneModeEnabler).close();
}
@Test @Test
public void updateInternetAvailable_wifiConnectedAndNoValidated_internetUnavailable() { public void updateInternetAvailable_wifiConnectedAndNoValidated_internetUnavailable() {
final NetworkCapabilities networkCapabilities = new NetworkCapabilities.Builder() final NetworkCapabilities networkCapabilities = new NetworkCapabilities.Builder()