diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-05-20 22:20:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 22:20:06 +0000 |
| commit | 863ddcc7acef56eaf49f424586d83543c6ba2bbf (patch) | |
| tree | 20b23b93b2f954f0b16b233b298556586a95e1be /services | |
| parent | 37f4e44ae614987c5ed953a1829c7181bb775e1f (diff) | |
| parent | 9f6c25f57e26f3e2f9c744547a139d14b7d3db5c (diff) | |
| download | frameworks_base-863ddcc7acef56eaf49f424586d83543c6ba2bbf.zip frameworks_base-863ddcc7acef56eaf49f424586d83543c6ba2bbf.tar.gz frameworks_base-863ddcc7acef56eaf49f424586d83543c6ba2bbf.tar.bz2 | |
Merge "Per-user telephony restrictions"
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index fd180bf..102b2d4 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -789,6 +789,7 @@ public class UserManagerService extends IUserManager.Stub { writeBoolean(serializer, restrictions, UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA); writeBoolean(serializer, restrictions, UserManager.DISALLOW_UNMUTE_MICROPHONE); writeBoolean(serializer, restrictions, UserManager.DISALLOW_ADJUST_VOLUME); + writeBoolean(serializer, restrictions, UserManager.DISALLOW_TELEPHONY); serializer.endTag(null, TAG_RESTRICTIONS); } serializer.endTag(null, TAG_USER); @@ -941,6 +942,7 @@ public class UserManagerService extends IUserManager.Stub { UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA); readBoolean(parser, restrictions, UserManager.DISALLOW_UNMUTE_MICROPHONE); readBoolean(parser, restrictions, UserManager.DISALLOW_ADJUST_VOLUME); + readBoolean(parser, restrictions, UserManager.DISALLOW_TELEPHONY); } } } |