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

Commit 8d23bcc1 authored by Jared Duke's avatar Jared Duke Committed by Android (Google) Code Review
Browse files

Merge "Keep UserManagerInternal fields referenced with reflection"

parents 09cafe32 d91df331

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

+10 −6
Original line number Diff line number Diff line
@@ -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 = {