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 | |
| 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"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 11 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 96d6cc3..f6bc276 100644 --- a/api/current.txt +++ b/api/current.txt @@ -21042,6 +21042,7 @@ package android.os { field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media"; field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user"; field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location"; + field public static final java.lang.String DISALLOW_TELEPHONY = "no_telephony"; field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps"; field public static final java.lang.String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone"; field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer"; diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 312cdbe..ee219e3 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -266,6 +266,17 @@ public class UserManager { */ public static final String DISALLOW_ADJUST_VOLUME = "no_adjust_volume"; + /** + * Key for user restrictions. Specifies that the user is not allowed to send or receive + * phone calls or text messages. Emergency calls may still be permitted. + * The default value is <code>false</code>. + * <p/> + * Type: Boolean + * @see #setUserRestrictions(Bundle) + * @see #getUserRestrictions() + */ + public static final String DISALLOW_TELEPHONY = "no_telephony"; + /** @hide */ public static final int PIN_VERIFICATION_FAILED_INCORRECT = -3; /** @hide */ 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); } } } |