Merge change Ib8f16340 into eclair-mr2 (c24c0e9b) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -572,6 +572,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		// javadoc from interface
		public int stopUsingNetworkFeature(int networkType, String feature) {
		enforceChangePermission();

		int pid = getCallingPid();
		int uid = getCallingUid();

		@@ -611,7 +613,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		Log.d(TAG, "stopUsingNetworkFeature for net " + networkType +
		": " + feature);
		}
		enforceChangePermission();

		if (!ConnectivityManager.isNetworkTypeValid(networkType)) {
		return -1;
		}