diff options
| author | Nicolas Prévot <nprevot@google.com> | 2016-10-31 11:23:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-31 11:23:27 +0000 |
| commit | 7e0c4521f952cbf92d177413e3fe6a8a28489cd0 (patch) | |
| tree | c5ebb15b0023c4c5625ab27b6a50d1b4ca06d5e3 /core/java/android | |
| parent | 7182514d8b402975b079b18a8ff4da9f8e1ed830 (diff) | |
| parent | df1b87db5d1b473511b4f06bbc85dd7b418b7031 (diff) | |
Merge "Allow DO to remove user even if DISALLOW_REMOVE_USER is set."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/UserManagerInternal.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/os/UserManagerInternal.java b/core/java/android/os/UserManagerInternal.java index 93afb4376cf2..4bdb92bcafc8 100644 --- a/core/java/android/os/UserManagerInternal.java +++ b/core/java/android/os/UserManagerInternal.java @@ -128,6 +128,13 @@ public abstract class UserManagerInternal { public abstract UserInfo createUserEvenWhenDisallowed(String name, int flags); /** + * Same as {@link UserManager#removeUser(int userHandle)}, but bypasses the check for + * {@link UserManager#DISALLOW_REMOVE_USER} and does not require the + * {@link android.Manifest.permission#MANAGE_USERS} permission. + */ + public abstract boolean removeUserEvenWhenDisallowed(int userId); + + /** * Return whether the given user is running in an * {@code UserState.STATE_RUNNING_UNLOCKING} or * {@code UserState.STATE_RUNNING_UNLOCKED} state. |