summaryrefslogtreecommitdiff
path: root/core/java/android/content/Intent.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-10-21 07:44:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-21 07:44:46 -0700
commit8074e98b20ac04fdc032a1ed00dd6763b7e04147 (patch)
treebc6f29dced9a3eed7d2cd26b6220034dd9592b17 /core/java/android/content/Intent.java
parent7707b050f7f0f01819aaa6ccdafe0721c267fdeb (diff)
parentdb6a14cc85cede0769735fdac4da70766989a3ce (diff)
Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
Diffstat (limited to 'core/java/android/content/Intent.java')
-rw-r--r--core/java/android/content/Intent.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 97d299a8a582..cf0603e3a84d 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2430,7 +2430,8 @@ public class Intent implements Parcelable, Cloneable {
/**
* Broadcast sent to the system when a user is removed. Carries an extra EXTRA_USER_HANDLE that has
* the userHandle of the user. It is sent to all running users except the
- * one that has been removed. You must hold
+ * one that has been removed. The user will not be completely removed until all receivers have
+ * handled the broadcast. You must hold
* {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast.
* @hide
*/