diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-12 13:00:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 13:00:15 -0700 |
| commit | b1add0b8f251e237297ff7bad6a1107ef7d760f2 (patch) | |
| tree | c4f2ab40b07b03dd32baf96afe33d95c7a2da142 /core/java/android/content | |
| parent | 830dfe41d164184741cc9f446d3fb6c39987469e (diff) | |
| parent | 6892f1ec9670432f1cab71813592077bea991a8b (diff) | |
| download | frameworks_base-b1add0b8f251e237297ff7bad6a1107ef7d760f2.zip frameworks_base-b1add0b8f251e237297ff7bad6a1107ef7d760f2.tar.gz frameworks_base-b1add0b8f251e237297ff7bad6a1107ef7d760f2.tar.bz2 | |
am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
Fix issue #6641368: can't launch gallery
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index b9811c8..f8898c1 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -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), |