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

Commit c55cb6af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exposed UserManager.getDisplayIdAssignedToUser as @TestApi" into... 

Merge "Exposed UserManager.getDisplayIdAssignedToUser as @TestApi" into udc-dev am: b981c2d6 am: 2b5a473b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21558858



Change-Id: I5367bb81d02c2fe1b7f25cfa3271fed214d32c6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db8b8b21 2b5a473b

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2181,6 +2181,7 @@ package android.os { 
    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle getBootUser();

    method public int getDisplayIdAssignedToUser();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.Set<java.lang.String> getPreInstallableSystemPackages(@NonNull String);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public String getUserType();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean);

core/java/android/os/UserManager.java

+1 −0
Original line number Diff line number Diff line
@@ -3065,6 +3065,7 @@ public class UserManager { 
     *

     * @hide

     */

    @TestApi

    public int getDisplayIdAssignedToUser() {

        try {

            return mService.getDisplayIdAssignedToUser();