Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 07f7d30449 (6039d34f) · Commits · e / os / android_frameworks_base

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.PackageManager;
		import android.content.res.Configuration;
		import android.database.ContentObserver;
		import android.net.CaptivePortal;
		@@ -5396,13 +5397,26 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}
		}

		private boolean checkUnsupportedStartingFrom(int version, String callingPackageName) {
		final PackageManager pm = mContext.getPackageManager();
		final int userId = UserHandle.getCallingUserId();
		try {
		final int callingVersion = pm.getApplicationInfoAsUser(
		callingPackageName, 0 /* flags */, userId).targetSdkVersion;
		if (callingVersion < version) return false;
		} catch (PackageManager.NameNotFoundException e) { }
		return true;
		}

		@Override
		public NetworkRequest requestNetwork(NetworkCapabilities networkCapabilities,
		Messenger messenger, int timeoutMs, IBinder binder, int legacyType,
		@NonNull String callingPackageName) {
		if (legacyType != TYPE_NONE && !checkNetworkStackPermission()) {
		if (checkUnsupportedStartingFrom(Build.VERSION_CODES.M, callingPackageName)) {
		throw new SecurityException("Insufficient permissions to specify legacy type");
		}
		}
		final int callingUid = Binder.getCallingUid();
		final NetworkRequest.Type type = (networkCapabilities == null)
		? NetworkRequest.Type.TRACK_DEFAULT