Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev am: ab10e1a7db (ce0d273b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Tethering.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1371,6 +1371,7 @@ public class Tethering extends BaseNetworkObserver {
		sendMessageDelayed(CMD_RETRY_UPSTREAM, UPSTREAM_SETTLE_TIME_MS);
		}
		}
		mUpstreamNetworkMonitor.setCurrentUpstream((ns != null) ? ns.network : null);
		setUpstreamNetwork(ns);
		}

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

+46 −6

Original line number	Diff line number	Diff line
		@@ -95,7 +95,10 @@ public class UpstreamNetworkMonitor {
		private NetworkCallback mDefaultNetworkCallback;
		private NetworkCallback mMobileNetworkCallback;
		private boolean mDunRequired;
		private Network mCurrentDefault;
		// The current system default network (not really used yet).
		private Network mDefaultInternetNetwork;
		// The current upstream network used for tethering.
		private Network mTetheringUpstreamNetwork;

		public UpstreamNetworkMonitor(Context ctx, StateMachine tgt, SharedLog log, int what) {
		mContext = ctx;
		@@ -130,10 +133,12 @@ public class UpstreamNetworkMonitor {

		releaseCallback(mDefaultNetworkCallback);
		mDefaultNetworkCallback = null;
		mDefaultInternetNetwork = null;

		releaseCallback(mListenAllCallback);
		mListenAllCallback = null;

		mTetheringUpstreamNetwork = null;
		mNetworkMap.clear();
		}

		@@ -207,7 +212,7 @@ public class UpstreamNetworkMonitor {
		break;
		default:
		/* If we've found an active upstream connection that's not DUN/HIPRI
		* we should stop any outstanding DUN/HIPRI start requests.
		* we should stop any outstanding DUN/HIPRI requests.
		*
		* If we found NONE we don't want to do this as we want any previous
		* requests to keep trying to bring up something we can use.
		@@ -219,6 +224,10 @@ public class UpstreamNetworkMonitor {
		return typeStatePair.ns;
		}

		public void setCurrentUpstream(Network upstream) {
		mTetheringUpstreamNetwork = upstream;
		}

		public Set<IpPrefix> getLocalPrefixes() {
		return (Set<IpPrefix>) mLocalPrefixes.clone();
		}
		@@ -250,7 +259,7 @@ public class UpstreamNetworkMonitor {
		// These request*() calls can be deleted post oag/339444.
		return;
		}
		mCurrentDefault = network;
		mDefaultInternetNetwork = network;
		break;

		case CALLBACK_MOBILE_REQUEST:
		@@ -302,6 +311,13 @@ public class UpstreamNetworkMonitor {
		network, newNc));
		}

		// Log changes in upstream network signal strength, if available.
		if (network.equals(mTetheringUpstreamNetwork) && newNc.hasSignalStrength()) {
		final int newSignal = newNc.getSignalStrength();
		final String prevSignal = getSignalStrength(prev.networkCapabilities);
		mLog.logf("upstream network signal strength: %s -> %s", prevSignal, newSignal);
		}

		mNetworkMap.put(network, new NetworkState(
		null, prev.linkProperties, newNc, network, null, null));
		// TODO: If sufficient information is available to select a more
		@@ -330,9 +346,21 @@ public class UpstreamNetworkMonitor {
		notifyTarget(EVENT_ON_LINKPROPERTIES, network);
		}

		private void handleSuspended(int callbackType, Network network) {
		if (callbackType != CALLBACK_LISTEN_ALL) return;
		if (!network.equals(mTetheringUpstreamNetwork)) return;
		mLog.log("SUSPENDED current upstream: " + network);
		}

		private void handleResumed(int callbackType, Network network) {
		if (callbackType != CALLBACK_LISTEN_ALL) return;
		if (!network.equals(mTetheringUpstreamNetwork)) return;
		mLog.log("RESUMED current upstream: " + network);
		}

		private void handleLost(int callbackType, Network network) {
		if (callbackType == CALLBACK_TRACK_DEFAULT) {
		mCurrentDefault = null;
		mDefaultInternetNetwork = null;
		// Receiving onLost() for a default network does not necessarily
		// mean the network is gone. We wait for a separate notification
		// on either the LISTEN_ALL or MOBILE_REQUEST callbacks before
		@@ -401,8 +429,15 @@ public class UpstreamNetworkMonitor {
		recomputeLocalPrefixes();
		}

		// TODO: Handle onNetworkSuspended();
		// TODO: Handle onNetworkResumed();
		@Override
		public void onNetworkSuspended(Network network) {
		handleSuspended(mCallbackType, network);
		}

		@Override
		public void onNetworkResumed(Network network) {
		handleResumed(mCallbackType, network);
		}

		@Override
		public void onLost(Network network) {
		@@ -467,4 +502,9 @@ public class UpstreamNetworkMonitor {

		return prefixSet;
		}

		private static String getSignalStrength(NetworkCapabilities nc) {
		if (nc == null \|\| !nc.hasSignalStrength()) return "unknown";
		return Integer.toString(nc.getSignalStrength());
		}
		}

services/net/java/android/net/util/SharedLog.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,10 @@ public class SharedLog {
		record(Category.NONE, msg);
		}

		public void logf(String fmt, Object... args) {
		log(String.format(fmt, args));
		}

		public void mark(String msg) {
		record(Category.MARK, msg);
		}