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

Commit 404b70e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Makes UM.isUsersOnSecondaryDisplaysSupported() @TestApi"

parents 274e5160 652047ab

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1874,7 +1874,7 @@ package android.os { 
    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);

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

    method public static boolean isSplitSystemUser();

    method public static boolean isUsersOnSecondaryDisplaysEnabled();

    method public boolean isUsersOnSecondaryDisplaysSupported();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo preCreateUser(@NonNull String) throws android.os.UserManager.UserOperationException;

  }

core/java/android/os/UserManager.java

+3 −2
Original line number Diff line number Diff line
@@ -2843,7 +2843,6 @@ public class UserManager { 
    /**

     * @hide

     */

    @TestApi

    public static boolean isUsersOnSecondaryDisplaysEnabled() {

        return SystemProperties.getBoolean("fw.users_on_secondary_displays",

                Resources.getSystem()
@@ -2853,10 +2852,12 @@ public class UserManager { 
    /**

     * Returns whether the device allows users to run (and launch activities) on secondary displays.

     *

     * @return {@code false} for most devices, except automotive vehicles with passenger displays.

     * @return {@code false} for most devices, except on automotive builds for vehiches with

     * passenger displays.

     *

     * @hide

     */

    @TestApi

    public boolean isUsersOnSecondaryDisplaysSupported() {

        return isUsersOnSecondaryDisplaysEnabled();

    }