diff options
| -rw-r--r-- | core/api/module-lib-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 413422331d88..d22686c15e9b 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -63,6 +63,8 @@ package android.app.admin { public class DevicePolicyManager { method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void acknowledgeNewUserDisclaimer(); + method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void clearLogoutUser(); + method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.UserHandle getLogoutUser(); field public static final String ACTION_SHOW_NEW_USER_DISCLAIMER = "android.app.action.SHOW_NEW_USER_DISCLAIMER"; } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index fa0af2d47242..96d037c905aa 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -10019,14 +10019,17 @@ public class DevicePolicyManager { /** * Gets the user a {@link #logoutUser(ComponentName)} call would switch to, - * or {@link UserHandle#USER_NULL} if the current user is not in a session. + * or {@code null} if the current user is not in a session. * * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_USERS) - public @UserIdInt int getLogoutUserId() { + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + public @Nullable UserHandle getLogoutUser() { + // TODO(b/214336184): add CTS test try { - return mService.getLogoutUserId(); + int userId = mService.getLogoutUserId(); + return userId == UserHandle.USER_NULL ? null : UserHandle.of(userId); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } @@ -10040,7 +10043,9 @@ public class DevicePolicyManager { * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_USERS) + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public void clearLogoutUser() { + // TODO(b/214336184): add CTS test try { mService.clearLogoutUser(); } catch (RemoteException re) { |