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

Commit 4ac64964 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Make USER_CURRENT accessible by the Test" into udc-dev am: fa4ff95c am: 3fdc91e8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22983216



Change-Id: If7e2084fb351411973da2841410cdd9e47964f5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbed76df 3fdc91e8

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2368,6 +2368,7 @@ package android.os { 
    method public static boolean isApp(int);

    field public static final int MIN_SECONDARY_USER_ID = 10; // 0xa

    field public static final int USER_ALL = -1; // 0xffffffff

    field public static final int USER_CURRENT = -2; // 0xfffffffe

    field public static final int USER_NULL = -10000; // 0xffffd8f0

    field public static final int USER_SYSTEM = 0; // 0x0

  }

core/java/android/os/UserHandle.java

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public final class UserHandle implements Parcelable { 


    /** @hide A user id to indicate the currently active user */

    @UnsupportedAppUsage

    @TestApi

    public static final @UserIdInt int USER_CURRENT = -2;



    /** @hide A user handle to indicate the current user of the device */