summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/Intent.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2013-01-07 12:24:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-07 12:24:09 -0800
commit017129481b50b41a6ed102c76efe8b12d617a5ea (patch)
tree5a8fa261b004492433bfbfaccd6f03c42f004c44 /core/java/android/content/Intent.java
parentdff561f42bdf15013d10666afdd1fd5fa16e9438 (diff)
parent449f006f9391b8c42d6d95ba06970216e8ef9f84 (diff)
downloadframeworks_base-017129481b50b41a6ed102c76efe8b12d617a5ea.zip
frameworks_base-017129481b50b41a6ed102c76efe8b12d617a5ea.tar.gz
frameworks_base-017129481b50b41a6ed102c76efe8b12d617a5ea.tar.bz2
am 449f006f: am 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
* commit '449f006f9391b8c42d6d95ba06970216e8ef9f84': Correcting typo in doc of MEDIA_XXX intents
Diffstat (limited to 'core/java/android/content/Intent.java')
-rw-r--r--core/java/android/content/Intent.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index cf0603e..89b1bbd 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1950,7 +1950,7 @@ public class Intent implements Parcelable, Cloneable {
/**
* Broadcast Action: External media is present, but not mounted at its mount point.
- * The path to the mount point for the removed media is contained in the Intent.mData field.
+ * The path to the mount point for the unmounted media is contained in the Intent.mData field.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_MEDIA_UNMOUNTED = "android.intent.action.MEDIA_UNMOUNTED";
@@ -1971,7 +1971,7 @@ public class Intent implements Parcelable, Cloneable {
/**
* Broadcast Action: External media is present and mounted at its mount point.
- * The path to the mount point for the removed media is contained in the Intent.mData field.
+ * The path to the mount point for the mounted media is contained in the Intent.mData field.
* The Intent contains an extra with name "read-only" and Boolean value to indicate if the
* media was mounted read only.
*/
@@ -2002,7 +2002,7 @@ public class Intent implements Parcelable, Cloneable {
/**
* Broadcast Action: External media is present but cannot be mounted.
- * The path to the mount point for the removed media is contained in the Intent.mData field.
+ * The path to the mount point for the unmountable media is contained in the Intent.mData field.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_MEDIA_UNMOUNTABLE = "android.intent.action.MEDIA_UNMOUNTABLE";