Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't request information on unregistered callbacks"

Browse Source
This commit is contained in:
Erik Kline
2017-02-21 09:54:04 +00:00
committed by Gerrit Code Review
parent d95aa50b18 32858e14ca
commit 14e3db3de5
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java
View File

@@ -183,11 +183,31 @@ public class UpstreamNetworkMonitor {
case CALLBACK_LISTEN_ALL:
break;
case CALLBACK_TRACK_DEFAULT:
if (mDefaultNetworkCallback == null) {
// The callback was unregistered in the interval between
// ConnectivityService calling onAvailable() and our
// handling of it here on the mTarget.getHandler() thread.
// Clean-up of this network entry is deferred to the
// handling of onLost() by other callbacks.
// TODO: change to Log.wtf() after oag/331764 is merged.
return;
}
cm().requestNetworkCapabilities(mDefaultNetworkCallback);
cm().requestLinkProperties(mDefaultNetworkCallback);
mCurrentDefault = network;
break;
case CALLBACK_MOBILE_REQUEST:
if (mMobileNetworkCallback == null) {
// The callback was unregistered in the interval between
// ConnectivityService calling onAvailable() and our
// handling of it here on the mTarget.getHandler() thread.
// Clean-up of this network entry is deferred to the
// handling of onLost() by other callbacks.
// TODO: change to Log.wtf() after oag/331764 is merged.
return;
}
cm().requestNetworkCapabilities(mMobileNetworkCallback);
cm().requestLinkProperties(mMobileNetworkCallback);
break;