LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update state in NetworkInfo when network resumes"

Browse Source
This commit is contained in:
Chiachang Wang
2020-02-15 03:16:31 +00:00
committed by Gerrit Code Review
parent 50e2cbde28 aa88bca82b
commit 9e3dd9a78f
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -6907,6 +6907,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
// worry about multiple different substates of CONNECTED. // worry about multiple different substates of CONNECTED.
newInfo.setDetailedState(NetworkInfo.DetailedState.SUSPENDED, info.getReason(), newInfo.setDetailedState(NetworkInfo.DetailedState.SUSPENDED, info.getReason(),
info.getExtraInfo()); info.getExtraInfo());
} else if (!suspended && info.getDetailedState() == NetworkInfo.DetailedState.SUSPENDED) {
// SUSPENDED state is currently only overridden from CONNECTED state. In the case the
// network agent is created, then goes to suspended, then goes out of suspended without
// ever setting connected. Check if network agent is ever connected to update the state.
newInfo.setDetailedState(nai.everConnected
? NetworkInfo.DetailedState.CONNECTED
: NetworkInfo.DetailedState.CONNECTING,
info.getReason(),
info.getExtraInfo());
} }
newInfo.setRoaming(!nai.networkCapabilities.hasCapability(NET_CAPABILITY_NOT_ROAMING)); newInfo.setRoaming(!nai.networkCapabilities.hasCapability(NET_CAPABILITY_NOT_ROAMING));
return newInfo; return newInfo;

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3154,6 +3154,7 @@ public class ConnectivityServiceTest {
mCellNetworkAgent); mCellNetworkAgent);
cellNetworkCallback.expectCallback(CallbackEntry.SUSPENDED, mCellNetworkAgent); cellNetworkCallback.expectCallback(CallbackEntry.SUSPENDED, mCellNetworkAgent);
cellNetworkCallback.assertNoCallback(); cellNetworkCallback.assertNoCallback();
assertEquals(NetworkInfo.State.SUSPENDED, mCm.getActiveNetworkInfo().getState());
// Register a garden variety default network request. // Register a garden variety default network request.
TestNetworkCallback dfltNetworkCallback = new TestNetworkCallback(); TestNetworkCallback dfltNetworkCallback = new TestNetworkCallback();
@@ -3169,6 +3170,7 @@ public class ConnectivityServiceTest {
mCellNetworkAgent); mCellNetworkAgent);
cellNetworkCallback.expectCallback(CallbackEntry.RESUMED, mCellNetworkAgent); cellNetworkCallback.expectCallback(CallbackEntry.RESUMED, mCellNetworkAgent);
cellNetworkCallback.assertNoCallback(); cellNetworkCallback.assertNoCallback();
assertEquals(NetworkInfo.State.CONNECTED, mCm.getActiveNetworkInfo().getState());
dfltNetworkCallback = new TestNetworkCallback(); dfltNetworkCallback = new TestNetworkCallback();
mCm.registerDefaultNetworkCallback(dfltNetworkCallback); mCm.registerDefaultNetworkCallback(dfltNetworkCallback);