Merge "Implement call log permission compatibility." (29d6fa9d) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageParser.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -94,10 +94,12 @@ public class PackageParser {
		public static class SplitPermissionInfo {
		public final String rootPerm;
		public final String[] newPerms;
		public final int targetSdk;

		public SplitPermissionInfo(String rootPerm, String[] newPerms) {
		public SplitPermissionInfo(String rootPerm, String[] newPerms, int targetSdk) {
		this.rootPerm = rootPerm;
		this.newPerms = newPerms;
		this.targetSdk = targetSdk;
		}
		}

		@@ -126,7 +128,14 @@ public class PackageParser {
		public static final PackageParser.SplitPermissionInfo SPLIT_PERMISSIONS[] =
		new PackageParser.SplitPermissionInfo[] {
		new PackageParser.SplitPermissionInfo(android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
		new String[] { android.Manifest.permission.READ_EXTERNAL_STORAGE })
		new String[] { android.Manifest.permission.READ_EXTERNAL_STORAGE },
		android.os.Build.VERSION_CODES.CUR_DEVELOPMENT+1),
		new PackageParser.SplitPermissionInfo(android.Manifest.permission.READ_CONTACTS,
		new String[] { android.Manifest.permission.READ_CALL_LOG },
		android.os.Build.VERSION_CODES.JELLY_BEAN),
		new PackageParser.SplitPermissionInfo(android.Manifest.permission.WRITE_CONTACTS,
		new String[] { android.Manifest.permission.WRITE_CALL_LOG },
		android.os.Build.VERSION_CODES.JELLY_BEAN)
		};

		private String mArchiveSourcePath;
		@@ -1293,7 +1302,8 @@ public class PackageParser {
		for (int is=0; is<NS; is++) {
		final PackageParser.SplitPermissionInfo spi
		= PackageParser.SPLIT_PERMISSIONS[is];
		if (!pkg.requestedPermissions.contains(spi.rootPerm)) {
		if (pkg.applicationInfo.targetSdkVersion >= spi.targetSdk
		\|\| !pkg.requestedPermissions.contains(spi.rootPerm)) {
		break;
		}
		for (int in=0; in<spi.newPerms.length; in++) {

tools/aapt/Command.cpp

+24 −0

Original line number	Diff line number	Diff line
		@@ -639,6 +639,12 @@ int doDump(Bundle* bundle)
		// If an app requests write storage, they will also get read storage.
		bool hasReadExternalStoragePermission = false;

		// Implement transition to read and write call log.
		bool hasReadContactsPermission = false;
		bool hasWriteContactsPermission = false;
		bool hasReadCallLogPermission = false;
		bool hasWriteCallLogPermission = false;

		// This next group of variables is used to implement a group of
		// backward-compatibility heuristics necessitated by the addition of
		// some new uses-feature constants in 2.1 and 2.2. In most cases, the
		@@ -1006,6 +1012,14 @@ int doDump(Bundle* bundle)
		hasReadExternalStoragePermission = true;
		} else if (name == "android.permission.READ_PHONE_STATE") {
		hasReadPhoneStatePermission = true;
		} else if (name == "android.permission.READ_CONTACTS") {
		hasReadContactsPermission = true;
		} else if (name == "android.permission.WRITE_CONTACTS") {
		hasWriteContactsPermission = true;
		} else if (name == "android.permission.READ_CALL_LOG") {
		hasReadCallLogPermission = true;
		} else if (name == "android.permission.WRITE_CALL_LOG") {
		hasWriteCallLogPermission = true;
		}
		printf("uses-permission:'%s'\n", name.string());
		} else {
		@@ -1181,6 +1195,16 @@ int doDump(Bundle* bundle)
		printf("uses-permission:'android.permission.READ_EXTERNAL_STORAGE'\n");
		}

		// Pre-JellyBean call log permission compatibility.
		if (targetSdk < 16) {
		if (!hasReadCallLogPermission && hasReadContactsPermission) {
		printf("uses-permission:'android.permission.READ_CALL_LOG'\n");
		}
		if (!hasWriteCallLogPermission && hasWriteContactsPermission) {
		printf("uses-permission:'android.permission.WRITE_CALL_LOG'\n");
		}
		}

		/* The following blocks handle printing "inferred" uses-features, based
		* on whether related features or permissions are used by the app.
		* Note that the various spec*Feature variables denote whether the