resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp (524b2e4f) · Commits · e / os / android_frameworks_base

core/res/AndroidManifest.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -1262,6 +1262,11 @@
		<permission android:name="android.permission.CONNECTIVITY_INTERNAL"
		android:protectionLevel="signature\|privileged" />

		<!-- Allows an internal user to use restricted Networks.
		@hide -->
		<permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"
		android:protectionLevel="signature\|privileged" />

		<!-- Allows a system application to access hardware packet offload capabilities.
		@hide -->
		<permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD"

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -1577,6 +1577,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
		"ConnectivityService");
		}

		private void enforceConnectivityRestrictedNetworksPermission() {
		try {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS,
		"ConnectivityService");
		return;
		} catch (SecurityException e) { /* fallback to ConnectivityInternalPermission */ }
		enforceConnectivityInternalPermission();
		}

		private void enforceKeepalivePermission() {
		mContext.enforceCallingOrSelfPermission(KeepaliveTracker.PERMISSION, "ConnectivityService");
		}
		@@ -4109,7 +4119,7 @@ public class ConnectivityService extends IConnectivityManager.Stub

		private void enforceNetworkRequestPermissions(NetworkCapabilities networkCapabilities) {
		if (networkCapabilities.hasCapability(NET_CAPABILITY_NOT_RESTRICTED) == false) {
		enforceConnectivityInternalPermission();
		enforceConnectivityRestrictedNetworksPermission();
		} else {
		enforceChangePermission();
		}

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

+18 −16

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.server.connectivity;

		import static android.Manifest.permission.CHANGE_NETWORK_STATE;
		import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
		import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS;
		import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
		import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
		import static android.content.pm.PackageManager.GET_PERMISSIONS;
		@@ -65,10 +66,10 @@ public class PermissionMonitor {
		private final BroadcastReceiver mIntentReceiver;

		// Values are User IDs.
		private final Set<Integer> mUsers = new HashSet<Integer>();
		private final Set<Integer> mUsers = new HashSet<>();

		// Keys are App IDs. Values are true for SYSTEM permission and false for NETWORK permission.
		private final Map<Integer, Boolean> mApps = new HashMap<Integer, Boolean>();
		private final Map<Integer, Boolean> mApps = new HashMap<>();

		public PermissionMonitor(Context context, INetworkManagementService netd) {
		mContext = context;
		@@ -126,14 +127,14 @@ public class PermissionMonitor {
		}

		boolean isNetwork = hasNetworkPermission(app);
		boolean isSystem = hasSystemPermission(app);
		boolean hasRestrictedPermission = hasRestrictedNetworkPermission(app);

		if (isNetwork \|\| isSystem) {
		if (isNetwork \|\| hasRestrictedPermission) {
		Boolean permission = mApps.get(uid);
		// If multiple packages share a UID (cf: android:sharedUserId) and ask for different
		// permissions, don't downgrade (i.e., if it's already SYSTEM, leave it as is).
		if (permission == null \|\| permission == NETWORK) {
		mApps.put(uid, isSystem);
		mApps.put(uid, hasRestrictedPermission);
		}
		}
		}
		@@ -164,12 +165,13 @@ public class PermissionMonitor {
		return hasPermission(app, CHANGE_NETWORK_STATE);
		}

		private boolean hasSystemPermission(PackageInfo app) {
		private boolean hasRestrictedNetworkPermission(PackageInfo app) {
		int flags = app.applicationInfo != null ? app.applicationInfo.flags : 0;
		if ((flags & FLAG_SYSTEM) != 0 \|\| (flags & FLAG_UPDATED_SYSTEM_APP) != 0) {
		return true;
		}
		return hasPermission(app, CONNECTIVITY_INTERNAL);
		return hasPermission(app, CONNECTIVITY_INTERNAL)
		\|\| hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS);
		}

		private int[] toIntArray(List<Integer> list) {
		@@ -181,8 +183,8 @@ public class PermissionMonitor {
		}

		private void update(Set<Integer> users, Map<Integer, Boolean> apps, boolean add) {
		List<Integer> network = new ArrayList<Integer>();
		List<Integer> system = new ArrayList<Integer>();
		List<Integer> network = new ArrayList<>();
		List<Integer> system = new ArrayList<>();
		for (Entry<Integer, Boolean> app : apps.entrySet()) {
		List<Integer> list = app.getValue() ? system : network;
		for (int user : users) {
		@@ -209,7 +211,7 @@ public class PermissionMonitor {
		}
		mUsers.add(user);

		Set<Integer> users = new HashSet<Integer>();
		Set<Integer> users = new HashSet<>();
		users.add(user);
		update(users, mApps, true);
		}
		@@ -221,7 +223,7 @@ public class PermissionMonitor {
		}
		mUsers.remove(user);

		Set<Integer> users = new HashSet<Integer>();
		Set<Integer> users = new HashSet<>();
		users.add(user);
		update(users, mApps, false);
		}
		@@ -234,9 +236,9 @@ public class PermissionMonitor {
		try {
		final PackageInfo app = mPackageManager.getPackageInfo(name, GET_PERMISSIONS);
		final boolean isNetwork = hasNetworkPermission(app);
		final boolean isSystem = hasSystemPermission(app);
		if (isNetwork \|\| isSystem) {
		currentPermission = isSystem;
		final boolean hasRestrictedPermission = hasRestrictedNetworkPermission(app);
		if (isNetwork \|\| hasRestrictedPermission) {
		currentPermission = hasRestrictedPermission;
		}
		} catch (NameNotFoundException e) {
		// App not found.
		@@ -257,7 +259,7 @@ public class PermissionMonitor {
		if (permission != mApps.get(appUid)) {
		mApps.put(appUid, permission);

		Map<Integer, Boolean> apps = new HashMap<Integer, Boolean>();
		Map<Integer, Boolean> apps = new HashMap<>();
		apps.put(appUid, permission);
		update(mUsers, apps, true);
		}
		@@ -268,7 +270,7 @@ public class PermissionMonitor {
		loge("Invalid app in onAppRemoved: " + appUid);
		return;
		}
		Map<Integer, Boolean> apps = new HashMap<Integer, Boolean>();
		Map<Integer, Boolean> apps = new HashMap<>();

		Boolean permission = null;
		String[] packages = mPackageManager.getPackagesForUid(appUid);