summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-06-12 13:00:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 13:00:15 -0700
commitb1add0b8f251e237297ff7bad6a1107ef7d760f2 (patch)
treec4f2ab40b07b03dd32baf96afe33d95c7a2da142 /tools
parent830dfe41d164184741cc9f446d3fb6c39987469e (diff)
parent6892f1ec9670432f1cab71813592077bea991a8b (diff)
downloadframeworks_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 'tools')
-rw-r--r--tools/aapt/Command.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index d428fef..0a5e590 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -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'," \