am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into...

* commit '6892f1ec9670432f1cab71813592077bea991a8b':
  Fix issue #6641368: can't launch gallery

diff --git a/Command.cpp b/Command.cpp
index d428fefc6cd90b5d987f83878df1d0f7d022dd4e..0a5e5904a95a530c1b1fbdde2942418a817f0dc8 100644 (file)
--- 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'," \