Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev (4a94e42b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -264,14 +264,10 @@ public final class DefaultPermissionGrantPolicy {
		}

		public void grantDefaultPermissions(int userId) {
		if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_EMBEDDED, 0)) {
		grantAllRuntimePermissions(userId);
		} else {
		grantPermissionsToSysComponentsAndPrivApps(userId);
		grantDefaultSystemHandlerPermissions(userId);
		grantDefaultPermissionExceptions(userId);
		}
		}

		private void grantRuntimePermissionsForPackage(int userId, PackageParser.Package pkg) {
		Set<String> permissions = new ArraySet<>();
		@@ -1247,6 +1243,13 @@ public final class DefaultPermissionGrantPolicy {
		if (dir.isDirectory() && dir.canRead()) {
		Collections.addAll(ret, dir.listFiles());
		}
		// For IoT devices, we check the oem partition for default permissions for each app.
		if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_EMBEDDED, 0)) {
		dir = new File(Environment.getOemDirectory(), "etc/default-permissions");
		if (dir.isDirectory() && dir.canRead()) {
		Collections.addAll(ret, dir.listFiles());
		}
		}
		return ret.isEmpty() ? null : ret.toArray(new File[0]);
		}