Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f6471ac authored Jun 11, 2012 by Dianne Hackborn Committed by Android (Google) Code Review Jun 11, 2012

Merge "Fix issue #6641368: can't launch gallery" into jb-dev

parents 1b159f66 2bd8d040

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -127,9 +127,13 @@ public class PackageParser {
		*/
		public static final PackageParser.SplitPermissionInfo SPLIT_PERMISSIONS[] =
		new PackageParser.SplitPermissionInfo[] {
		// READ_EXTERNAL_STORAGE is always required when an app requests
		// WRITE_EXTERNAL_STORAGE, because we can't have an app that has
		// write access without read access. The hack here with the target
		// target SDK version ensures that this grant is always done.
		new PackageParser.SplitPermissionInfo(android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
		new String[] { android.Manifest.permission.READ_EXTERNAL_STORAGE },
		android.os.Build.VERSION_CODES.JELLY_BEAN),
		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),

tools/aapt/Command.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -1204,7 +1204,9 @@ int doDump(Bundle* bundle)
		}

		// If the application has requested WRITE_EXTERNAL_STORAGE, we will
		// force them to always take READ_EXTERNAL_STORAGE as well.
		// force them to always take READ_EXTERNAL_STORAGE as well. We always
		// do this (regardless of target API version) because we can't have
		// an app with write permission but not read permission.
		if (!hasReadExternalStoragePermission && hasWriteExternalStoragePermission) {
		printf("uses-permission:'android.permission.READ_EXTERNAL_STORAGE'\n");
		printf("uses-implied-permission:'android.permission.READ_EXTERNAL_STORAGE'," \