Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 009ea5a0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev

parents 4573e29f 8a9f5d42

core/java/android/os/UserHandle.java

+1 −1
Original line number Diff line number Diff line
@@ -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