joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix a bug where the legacy extra info is reset on connect." am: 7e2d55206e

Browse source 
Change-Id: Ia0a2afe359cac6adfd33d2f839eddb8bd14b5f43
This commit is contained in:
Chalard Jean 2020-04-06 06:17:46 +00:00 • committed by Automerger Merge Worker
commit 9f964ebc15
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/java/android/net/NetworkAgent.java
View file

@ -624,7 +624,9 @@ public abstract class NetworkAgent {
throw new UnsupportedOperationException(
"Legacy agents can't call markConnected.");
}
mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);
// |reason| cannot be used by the non-legacy agents
mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null /* reason */,
mNetworkInfo.getExtraInfo());
queueOrSendMessage(EVENT_NETWORK_INFO_CHANGED, mNetworkInfo);
}
@ -638,7 +640,9 @@ public abstract class NetworkAgent {
if (mIsLegacy) {
throw new UnsupportedOperationException("Legacy agents can't call unregister.");
}
mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);
// When unregistering an agent nobody should use the extrainfo (or reason) any more.
mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null /* reason */,
null /* extraInfo */);
queueOrSendMessage(EVENT_NETWORK_INFO_CHANGED, mNetworkInfo);
}