diff options
| author | Emily Bernier <ember@google.com> | 2013-04-12 20:21:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 20:21:36 +0000 |
| commit | ce70311b67c3dba6ed4fbda41617f4e24c82dfc7 (patch) | |
| tree | 3c574c1d31d3038077bc57973226438679651a95 /services/java | |
| parent | e527d256dcf1df96da4cb8a2c144a02748bbf96d (diff) | |
| parent | b223f73a69f76f5e32a0bca267f945f464776f9d (diff) | |
| download | frameworks_base-ce70311b67c3dba6ed4fbda41617f4e24c82dfc7.zip frameworks_base-ce70311b67c3dba6ed4fbda41617f4e24c82dfc7.tar.gz frameworks_base-ce70311b67c3dba6ed4fbda41617f4e24c82dfc7.tar.bz2 | |
Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/pm/UserManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/pm/UserManagerService.java b/services/java/com/android/server/pm/UserManagerService.java index 3ef9370..df90a56 100644 --- a/services/java/com/android/server/pm/UserManagerService.java +++ b/services/java/com/android/server/pm/UserManagerService.java @@ -622,6 +622,8 @@ public class UserManagerService extends IUserManager.Stub { UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES); writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_BLUETOOTH); writeBoolean(serializer, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER); + writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS); + writeBoolean(serializer, restrictions, UserManager.DISALLOW_REMOVE_USER); serializer.endTag(null, TAG_RESTRICTIONS); } serializer.endTag(null, TAG_USER); @@ -742,6 +744,8 @@ public class UserManagerService extends IUserManager.Stub { UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES); readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_BLUETOOTH); readBoolean(parser, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER); + readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS); + readBoolean(parser, restrictions, UserManager.DISALLOW_REMOVE_USER); } } } |