diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2014-05-01 10:49:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-01 10:49:21 +0000 |
| commit | 3c4d9c56db5b24699956de0a5a841196185363cc (patch) | |
| tree | ccbfaf6ddcdfec78f23262150db16f171ea82efe /core/java/android/content | |
| parent | 8596f6998eddb0caa35532eb386ac6d00f81551d (diff) | |
| parent | df35d570ed25257c6782e632ab1bae5e1603855a (diff) | |
| download | frameworks_base-3c4d9c56db5b24699956de0a5a841196185363cc.zip frameworks_base-3c4d9c56db5b24699956de0a5a841196185363cc.tar.gz frameworks_base-3c4d9c56db5b24699956de0a5a841196185363cc.tar.bz2 | |
Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/UserInfo.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java index f53aa4c..c0383a3 100644 --- a/core/java/android/content/pm/UserInfo.java +++ b/core/java/android/content/pm/UserInfo.java @@ -27,8 +27,8 @@ import android.os.UserHandle; */ public class UserInfo implements Parcelable { - /** 6 bits for user type */ - public static final int FLAG_MASK_USER_TYPE = 0x0000003F; + /** 8 bits for user type */ + public static final int FLAG_MASK_USER_TYPE = 0x000000FF; /** * *************************** NOTE *************************** @@ -70,6 +70,11 @@ public class UserInfo implements Parcelable { */ public static final int FLAG_MANAGED_PROFILE = 0x00000020; + /** + * Indicates that this user is disabled. + */ + public static final int FLAG_DISABLED = 0x00000040; + public static final int NO_PROFILE_GROUP_ID = -1; @@ -117,6 +122,10 @@ public class UserInfo implements Parcelable { return (flags & FLAG_MANAGED_PROFILE) == FLAG_MANAGED_PROFILE; } + public boolean isEnabled() { + return (flags & FLAG_DISABLED) != FLAG_DISABLED; + } + /** * @return true if this user can be switched to. **/ |