Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 507feec4 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Don't request information on unregistered callbacks" am: 14e3db3d

am: 042be0bd

Change-Id: Idd102961c422be5c94e4bf92c3aaae7f660f4313
parents d60d606e 042be0bd
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -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;