diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-02-12 00:05:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-02-12 00:05:39 +0000 |
| commit | 92adbe6a2554d94e141811f30ea68779e6784c3e (patch) | |
| tree | c6e86c7164498b53cbb2aeed971e96e86e2d5d64 /core/java/android/os/UserManager.java | |
| parent | 0d5372978597aab448aadbe36c08a21f4fb3e8c9 (diff) | |
| parent | 362212f8ad5af81c2c286e8ae4519768bf7aa497 (diff) | |
Merge "Added RemoveResult annotation to RemoveUserWhenPossible call"
Diffstat (limited to 'core/java/android/os/UserManager.java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 886c3fcb05f5..e56f214e30d9 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -4841,15 +4841,16 @@ public class UserManager { * @param overrideDevicePolicy when {@code true}, user is removed even if the caller has * the {@link #DISALLOW_REMOVE_USER} or {@link #DISALLOW_REMOVE_MANAGED_PROFILE} restriction * - * @return the result code {@link #REMOVE_RESULT_REMOVED}, {@link #REMOVE_RESULT_DEFERRED}, - * {@link #REMOVE_RESULT_ALREADY_BEING_REMOVED}, or {@link #REMOVE_RESULT_ERROR}. + * @return the {@link RemoveResult} code: {@link #REMOVE_RESULT_REMOVED}, + * {@link #REMOVE_RESULT_DEFERRED}, {@link #REMOVE_RESULT_ALREADY_BEING_REMOVED}, or + * {@link #REMOVE_RESULT_ERROR}. * * @hide */ @SystemApi @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS, Manifest.permission.CREATE_USERS}) - public int removeUserWhenPossible(@NonNull UserHandle user, + public @RemoveResult int removeUserWhenPossible(@NonNull UserHandle user, boolean overrideDevicePolicy) { try { return mService.removeUserWhenPossible(user.getIdentifier(), overrideDevicePolicy); |