Merge "Make USER_CURRENT accessible by the Test" into udc-dev am: fa4ff95cb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22983216 Change-Id: I3db07954b4b6a372821530dd7598dee2c27360fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2367,6 +2367,7 @@ package android.os {
|
|||||||
method public static boolean isApp(int);
|
method public static boolean isApp(int);
|
||||||
field public static final int MIN_SECONDARY_USER_ID = 10; // 0xa
|
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_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_NULL = -10000; // 0xffffd8f0
|
||||||
field public static final int USER_SYSTEM = 0; // 0x0
|
field public static final int USER_SYSTEM = 0; // 0x0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ public final class UserHandle implements Parcelable {
|
|||||||
|
|
||||||
/** @hide A user id to indicate the currently active user */
|
/** @hide A user id to indicate the currently active user */
|
||||||
@UnsupportedAppUsage
|
@UnsupportedAppUsage
|
||||||
|
@TestApi
|
||||||
public static final @UserIdInt int USER_CURRENT = -2;
|
public static final @UserIdInt int USER_CURRENT = -2;
|
||||||
|
|
||||||
/** @hide A user handle to indicate the current user of the device */
|
/** @hide A user handle to indicate the current user of the device */
|
||||||
|
|||||||
Reference in New Issue
Block a user