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

[Provider Model] Fix settings crash issue

Browse Source 
- The GlobalSettingsChangeListener needs to be closed after the life
cycle is destroyed

Bug: 185756174
Bug: 186404332
Bug: 186591527
Test: manual test
atest -c InternetUpdaterTest

Change-Id: I9fbad3b303055c6c7a61ccad8efe69cefef56c58
This commit is contained in:
Weng Su
2021-05-06 05:48:20 +08:00
parent b4a9916adf
commit 88cafbaa24
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()