am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev

* commit '009ea5a04c38dd209b73d28cb867f05e63ec89cc':
  USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
This commit is contained in:
Dianne Hackborn
2012-09-10 15:51:08 -07:00
committed by Android Git Automerger

View File

@@ -40,7 +40,7 @@ public final class UserHandle implements Parcelable {
/** @hide A user id to indicate that we would like to send to the current
* user, but if this is calling from a user process then we will send it
* to the caller's user instead of failing wiht a security exception */
public static final int USER_CURRENT_OR_SELF = -2;
public static final int USER_CURRENT_OR_SELF = -3;
/** @hide A user handle to indicate that we would like to send to the current
* user, but if this is calling from a user process then we will send it