Merge "Make HiPri work when already connected." (b9e1ed2b) · Commits · e / os / android_frameworks_base

core/java/android/net/MobileDataStateTracker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -346,7 +346,7 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
		intent.putExtra(Phone.STATE_KEY, Phone.DataState.CONNECTED.toString());
		intent.putExtra(Phone.STATE_CHANGE_REASON_KEY, Phone.REASON_APN_CHANGED);
		intent.putExtra(Phone.DATA_APN_TYPES_KEY, mApnType);
		intent.putExtra(Phone.DATA_APN_TYPES_KEY, mApnTypeToWatchFor);
		intent.putExtra(Phone.DATA_APN_KEY, mApnName);
		intent.putExtra(Phone.DATA_IFACE_NAME_KEY, mInterfaceName);
		intent.putExtra(Phone.NETWORK_UNAVAILABLE_KEY, false);

+3 −1

Original line number	Diff line number	Diff line
		@@ -668,6 +668,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		synchronized(this) {
		// check if this process still has an outstanding start request
		if (!mFeatureUsers.contains(u)) {
		if (DBG) Slog.d(TAG, "ignoring - this process has no outstanding requests");
		return 1;
		}
		u.unlinkDeathRecipient();
		@@ -706,6 +707,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}
		tracker = mNetTrackers[usedNetworkType];
		if (tracker == null) {
		if (DBG) Slog.d(TAG, "ignoring - no known tracker for net type " + usedNetworkType);
		return -1;
		}
		if (usedNetworkType != networkType) {
		@@ -720,7 +722,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		callTeardown = true;
		}
		}

		if (DBG) Slog.d(TAG, "Doing network teardown");
		if (callTeardown) {
		tracker.teardown();
		return 1;