Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keep UserManagerInternal fields referenced with reflection"

Browse Source
This commit is contained in:
Jared Duke
2023-01-25 00:21:11 +00:00
committed by Android (Google) Code Review
parent 09cafe32e1 d91df3315e
commit 8d23bcc140
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/UserManagerInternal.java
View File

@@ -27,6 +27,8 @@ import android.os.Bundle;
import android.os.UserManager;
import android.util.DebugUtils;
import com.android.internal.annotations.Keep;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
@@ -47,9 +49,10 @@ public abstract class UserManagerInternal {
public @interface OwnerType {
}
public static final int USER_ASSIGNMENT_RESULT_SUCCESS_VISIBLE = 1;
public static final int USER_ASSIGNMENT_RESULT_SUCCESS_INVISIBLE = 2;
public static final int USER_ASSIGNMENT_RESULT_FAILURE = -1;
// TODO(b/248408342): Move keep annotation to the method referencing these fields reflectively.
@Keep public static final int USER_ASSIGNMENT_RESULT_SUCCESS_VISIBLE = 1;
@Keep public static final int USER_ASSIGNMENT_RESULT_SUCCESS_INVISIBLE = 2;
@Keep public static final int USER_ASSIGNMENT_RESULT_FAILURE = -1;
private static final String PREFIX_USER_ASSIGNMENT_RESULT = "USER_ASSIGNMENT_RESULT_";
@IntDef(flag = false, prefix = {PREFIX_USER_ASSIGNMENT_RESULT}, value = {
@@ -59,9 +62,10 @@ public abstract class UserManagerInternal {
})
public @interface UserAssignmentResult {}
public static final int USER_START_MODE_FOREGROUND = 1;
public static final int USER_START_MODE_BACKGROUND = 2;
public static final int USER_START_MODE_BACKGROUND_VISIBLE = 3;
// TODO(b/248408342): Move keep annotation to the method referencing these fields reflectively.
@Keep public static final int USER_START_MODE_FOREGROUND = 1;
@Keep public static final int USER_START_MODE_BACKGROUND = 2;
@Keep public static final int USER_START_MODE_BACKGROUND_VISIBLE = 3;
private static final String PREFIX_USER_START_MODE = "USER_START_MODE_";
@IntDef(flag = false, prefix = {PREFIX_USER_START_MODE}, value = {