commit b2a4176903315828d5139f2da3c17f61819b9c9e
author Jeff Sharkey <jsharkey@google.com> Wed Apr 03 22:17:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 03 22:17:08 2019 +0000
tree cc5bf8e159e37ecd1de9d2cc9e01994213de88ce
parent 1f616bc49227e83c178bc80f596ffa9100733e55
parent cf1fd5195f10e460f3efa2dd4b77ce3407c11443

Merge "Temporary hack until we have dynamic remounting."

services/core/java/com/android/server/StorageManagerService.java

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 36fa3c6..3079192 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3847,7 +3847,9 @@
                     uid, packageName, READ_EXTERNAL_STORAGE, OP_READ_EXTERNAL_STORAGE);
             final boolean hasWrite = StorageManager.checkPermissionAndAppOp(mContext, false, 0,
                     uid, packageName, WRITE_EXTERNAL_STORAGE, OP_WRITE_EXTERNAL_STORAGE);
-            final boolean hasStorage = hasRead || hasWrite;
+            // STOPSHIP: remove this temporary hack once we have dynamic runtime
+            // permissions fully enabled again
+            final boolean hasStorage = hasRead || hasWrite || true;
 
             // We're only willing to give out broad access if they also hold
             // runtime permission; this is a firm CDD requirement