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

Merge "Makes UM.isUsersOnSecondaryDisplaysSupported() @TestApi"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-20 02:59:22 +00:00
committed by Android (Google) Code Review
parent 274e516080 652047ab11
commit 404b70e411
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/test-current.txt
View File

@@ -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;
}

5
core/java/android/os/UserManager.java
View File

@@ -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();
}