diff options
| author | Emily Bernier <ember@google.com> | 2013-04-12 13:29:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-12 13:29:35 -0700 |
| commit | d65b268fcd7aadbbd22bdfbe9af6ffdf6005be21 (patch) | |
| tree | beb77159721de0d5e27c6337e868e0214fdc8ad7 /services/java | |
| parent | 8649660244943319fe0e588f6fca2ecceabd4429 (diff) | |
| parent | 9b8abb5abde4264b6ed4e022804c743faf68323d (diff) | |
| download | frameworks_base-d65b268fcd7aadbbd22bdfbe9af6ffdf6005be21.zip frameworks_base-d65b268fcd7aadbbd22bdfbe9af6ffdf6005be21.tar.gz frameworks_base-d65b268fcd7aadbbd22bdfbe9af6ffdf6005be21.tar.bz2 | |
am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
* commit '9b8abb5abde4264b6ed4e022804c743faf68323d':
Add user restrictions (credentials, user removal)
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); } } } |