From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 12 Jun 2012 19:41:36 +0000 (-0700)
Subject: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/41f5f5488d2c3487023e23d176ac94275f29992b?hp=b49089aea6e889e9215661aab9022bbdb671f015

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

* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery
---

diff --git a/Command.cpp b/Command.cpp
index d428fef..0a5e590 100644
--- a/Command.cpp
+++ b/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'," \