summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2015-06-26 22:36:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-26 22:36:13 +0000
commit0a202eac0103cae1c544d6f44bb67b236a3dde8d (patch)
tree371463bc31b120c003474ad3277c299eb00c8053 /core/java/android/content
parent1223a75a672ab249fb966055a98ea2ab807206cf (diff)
parente8490f1d78a62826742ddf4af8943e6666a1a8d0 (diff)
downloadframeworks_base-0a202eac0103cae1c544d6f44bb67b236a3dde8d.zip
frameworks_base-0a202eac0103cae1c544d6f44bb67b236a3dde8d.tar.gz
frameworks_base-0a202eac0103cae1c544d6f44bb67b236a3dde8d.tar.bz2
Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/Intent.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 83d6cb0..b1d80f0 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3784,6 +3784,9 @@ public class Intent implements Parcelable, Cloneable {
/** {@hide} */
public static final String EXTRA_REASON = "android.intent.extra.REASON";
+ /** {@hide} */
+ public static final String EXTRA_WIPE_EXTERNAL_STORAGE = "android.intent.extra.WIPE_EXTERNAL_STORAGE";
+
/**
* Optional {@link android.app.PendingIntent} extra used to deliver the result of the SIM
* activation request.