summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-06-11 12:27:05 -0700
committerDianne Hackborn <hackbod@google.com>2012-06-11 12:27:05 -0700
commit2bd8d0403be62df679f0f94ab4d84c9ae9a2e918 (patch)
tree64bab80cac947253c02794f0aea7d765aecb5e3b /tools
parenta7e3a1e0e7d308e7e78a1992038a34485d04ab29 (diff)
downloadframeworks_base-2bd8d0403be62df679f0f94ab4d84c9ae9a2e918.zip
frameworks_base-2bd8d0403be62df679f0f94ab4d84c9ae9a2e918.tar.gz
frameworks_base-2bd8d0403be62df679f0f94ab4d84c9ae9a2e918.tar.bz2
Fix issue #6641368: can't launch gallery
This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627, but with comments added so I don't make this mistake again. :) Change-Id: I053216279e3721f08f32f561bb989736ef619f82
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'," \