commit 009ea5a04c38dd209b73d28cb867f05e63ec89cc
author Dianne Hackborn <hackbod@google.com> Mon Sep 10 15:49:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 10 15:49:59 2012 -0700
tree b108cf08405b3a50369514c90e345daa8f2aac47
parent 4573e29faf40983f9d1df99bb0f506d77a868e05
parent 8a9f5d42a5cc373439ee8bbb9185dcce9086770d

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

core/java/android/os/UserHandle.java

diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index fff7d5f..7e4666c 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -40,7 +40,7 @@
     /** @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