Merge "Add UserHandle constants to SystemApi"
This commit is contained in:
@@ -4140,6 +4140,9 @@ package android.os {
|
||||
method public boolean isSystem();
|
||||
method public static int myUserId();
|
||||
method public static android.os.UserHandle of(int);
|
||||
field public static final android.os.UserHandle ALL;
|
||||
field public static final android.os.UserHandle CURRENT;
|
||||
field public static final android.os.UserHandle SYSTEM;
|
||||
}
|
||||
|
||||
public class UserManager {
|
||||
|
||||
@@ -1055,6 +1055,8 @@ package android.os {
|
||||
public final class UserHandle implements android.os.Parcelable {
|
||||
method public static int getAppId(int);
|
||||
method public int getIdentifier();
|
||||
field public static final android.os.UserHandle ALL;
|
||||
field public static final android.os.UserHandle CURRENT;
|
||||
field public static final android.os.UserHandle SYSTEM;
|
||||
}
|
||||
|
||||
|
||||
@@ -1120,8 +1120,6 @@ Landroid/os/UserHandle;->AID_APP_START:I
|
||||
Landroid/os/UserHandle;->AID_CACHE_GID_START:I
|
||||
Landroid/os/UserHandle;->AID_ROOT:I
|
||||
Landroid/os/UserHandle;->AID_SHARED_GID_START:I
|
||||
Landroid/os/UserHandle;->ALL:Landroid/os/UserHandle;
|
||||
Landroid/os/UserHandle;->CURRENT:Landroid/os/UserHandle;
|
||||
Landroid/os/UserHandle;->CURRENT_OR_SELF:Landroid/os/UserHandle;
|
||||
Landroid/os/UserHandle;->ERR_GID:I
|
||||
Landroid/os/UserHandle;->getAppIdFromSharedAppGid(I)I
|
||||
|
||||
@@ -38,12 +38,16 @@ public final class UserHandle implements Parcelable {
|
||||
public static final @UserIdInt int USER_ALL = -1;
|
||||
|
||||
/** @hide A user handle to indicate all users on the device */
|
||||
@SystemApi
|
||||
@TestApi
|
||||
public static final UserHandle ALL = new UserHandle(USER_ALL);
|
||||
|
||||
/** @hide A user id to indicate the currently active user */
|
||||
public static final @UserIdInt int USER_CURRENT = -2;
|
||||
|
||||
/** @hide A user handle to indicate the current user of the device */
|
||||
@SystemApi
|
||||
@TestApi
|
||||
public static final UserHandle CURRENT = new UserHandle(USER_CURRENT);
|
||||
|
||||
/** @hide A user id to indicate that we would like to send to the current
|
||||
@@ -82,6 +86,7 @@ public final class UserHandle implements Parcelable {
|
||||
public static final int USER_SERIAL_SYSTEM = 0;
|
||||
|
||||
/** @hide A user handle to indicate the "system" user of the device */
|
||||
@SystemApi
|
||||
@TestApi
|
||||
public static final UserHandle SYSTEM = new UserHandle(USER_SYSTEM);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user