summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alexandra Gherghina <alexgherghina@google.com> 2014-09-05 15:16:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-05 15:16:02 +0000
commitf363bda252efe4201c60c0b042fee9e98bf4d48e (patch)
tree7acc8cc2c8009fa28934da53d20f3a015a5372c7
parent8d4e83aca0ee9cebaa15481e5cd666dc10bc0c67 (diff)
parent3315f6b5a36e984b1c24d6be07c155bf5108b4df (diff)
Merge "Rename intent extra following API review" into lmp-dev
-rw-r--r--core/java/android/content/Intent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index b825c94d7564..51a58d11ef12 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3363,7 +3363,7 @@ public class Intent implements Parcelable, Cloneable {
* profiles - {@link #ACTION_MANAGED_PROFILE_ADDED} and {@link #ACTION_MANAGED_PROFILE_REMOVED}.
*/
public static final String EXTRA_USER =
- "android.intent.extra.user";
+ "android.intent.extra.USER";
/**
* Extra used in the response from a BroadcastReceiver that handles