diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-07-17 10:52:03 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-07-17 12:14:52 -0700 |
| commit | 390989da1967f9d385212cd2e22a50589ce69046 (patch) | |
| tree | 7fd8a8a29d5fecc5a6a0f3698f11d20383205bd6 /services | |
| parent | b3325cbb267da0e663742fec172d7ed7ffe2aa1f (diff) | |
| download | frameworks_base-390989da1967f9d385212cd2e22a50589ce69046.zip frameworks_base-390989da1967f9d385212cd2e22a50589ce69046.tar.gz frameworks_base-390989da1967f9d385212cd2e22a50589ce69046.tar.bz2 | |
Split telephony restrictions into outgoing calls and sms
DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced
DISALLOW_SMS.
Outgoing emergency calls should always be permitted.
Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 43469ba..b4cc252 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -843,7 +843,8 @@ 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); + writeBoolean(serializer, restrictions, UserManager.DISALLOW_OUTGOING_CALLS); + writeBoolean(serializer, restrictions, UserManager.DISALLOW_SMS); writeBoolean(serializer, restrictions, UserManager.DISALLOW_CREATE_WINDOWS); serializer.endTag(null, TAG_RESTRICTIONS); } @@ -986,7 +987,8 @@ 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); + readBoolean(parser, restrictions, UserManager.DISALLOW_OUTGOING_CALLS); + readBoolean(parser, restrictions, UserManager.DISALLOW_SMS); readBoolean(parser, restrictions, UserManager.DISALLOW_CREATE_WINDOWS); } |