commit 8d23bcc14044f3bbfc6a334cbadf146976f4d9f3
author Jared Duke <jdduke@google.com> Wed Jan 25 00:21:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 25 00:21:11 2023 +0000
tree 691c11f22b3dba1dd7bcc18efdde04b88b058ca6
parent 09cafe32e1334e2f194ed50cdc9bde05f83a6901
parent d91df3315e9eaffbcf3f3c146eed7d31eb67cadc

Merge "Keep UserManagerInternal fields referenced with reflection"

services/core/java/com/android/server/pm/UserManagerInternal.java

diff --git a/services/core/java/com/android/server/pm/UserManagerInternal.java b/services/core/java/com/android/server/pm/UserManagerInternal.java
index 1787116..3c5f309 100644
--- a/services/core/java/com/android/server/pm/UserManagerInternal.java
+++ b/services/core/java/com/android/server/pm/UserManagerInternal.java
@@ -27,6 +27,8 @@
 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 @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 @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 = {