Merge "Correct an error code to pass CTS." (9d6fa869) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -698,9 +698,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}
		NetworkStateTracker network = mNetTrackers[usedNetworkType];
		if (network != null) {
		if (usedNetworkType != networkType) {
		Integer currentPid = new Integer(getCallingPid());

		if (usedNetworkType != networkType) {
		NetworkStateTracker radio = mNetTrackers[networkType];
		NetworkInfo ni = network.getNetworkInfo();

		@@ -739,6 +738,14 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		network.reconnect();
		return Phone.APN_REQUEST_STARTED;
		} else {
		// need to remember this unsupported request so we respond appropriately on stop
		synchronized(this) {
		mFeatureUsers.add(f);
		if (!mNetRequestersPids[usedNetworkType].contains(currentPid)) {
		// this gets used for per-pid dns when connected
		mNetRequestersPids[usedNetworkType].add(currentPid);
		}
		}
		return -1;
		}
		}