From 652047ab111cee84f5ce3f70e6a31d4f8b59d16e Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Thu, 15 Sep 2022 15:22:31 +0000 Subject: [PATCH] Makes UM.isUsersOnSecondaryDisplaysSupported() @TestApi Initially, UM.isUsersOnSecondaryDisplaysEnabled() was marked @TestApi, but that's an static API meant to be used internally only. Test: m update-api Bug: 246003632 Change-Id: Icca31e7b82ffd03645a5cb27af27325c1bfc0bfe --- core/api/test-current.txt | 2 +- core/java/android/os/UserManager.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index deb5aca53b78d..17e43a14e8a20 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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 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; } diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index f6aaee8e3de0b..1e91700fcf01e 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -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(); }