From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 11 Jun 2012 19:27:05 +0000 (-0700)
Subject: Fix issue #6641368: can't launch gallery
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/c3334c0aaed58ec1c1f0d24b3fba77338d036b7a

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
---

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'," \