summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Felipe Leme <felipeal@google.com> 2016-02-10 18:02:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-10 18:02:21 +0000
commitd4c6582a605d6b6ac03a56053c39c9c5b81266ee (patch)
treebd91d79e7ef5ba45d5a3195fa30d09b8ee0501fc
parent8e87364a67ada7ce92730182719f7820886c13bd (diff)
parent52fe147602af948daef967cec9d41dbdfa34b187 (diff)
Merge "Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs." into nyc-dev
-rw-r--r--core/java/android/content/Intent.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 7dc74010aa77..0f6f856ae12a 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -8941,6 +8941,7 @@ public class Intent implements Parcelable, Cloneable {
case ACTION_MEDIA_SCANNER_SCAN_FILE:
case ACTION_PACKAGE_NEEDS_VERIFICATION:
case ACTION_PACKAGE_VERIFIED:
+ case ACTION_OPEN_EXTERNAL_DIRECTORY: // TODO: temporary until bug 26742218 is fixed
// Ignore legacy actions
break;
default: