Merge "Don't request information on unregistered callbacks" (042be0bd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -183,11 +183,31 @@ public class UpstreamNetworkMonitor {
	case CALLBACK_LISTEN_ALL:		case CALLBACK_LISTEN_ALL:
	break;		break;
	case CALLBACK_TRACK_DEFAULT:		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().requestNetworkCapabilities(mDefaultNetworkCallback);
	cm().requestLinkProperties(mDefaultNetworkCallback);		cm().requestLinkProperties(mDefaultNetworkCallback);
	mCurrentDefault = network;		mCurrentDefault = network;
	break;		break;
	case CALLBACK_MOBILE_REQUEST:		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().requestNetworkCapabilities(mMobileNetworkCallback);
	cm().requestLinkProperties(mMobileNetworkCallback);		cm().requestLinkProperties(mMobileNetworkCallback);
	break;		break;