summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMahaver Chopra <mahaver@google.com>2016-01-08 18:39:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-01-08 18:39:15 +0000
commit932f66428c8a6f292423147feb5f862cd2a8b528 (patch)
treee4aff89c64b0d76ce9ec3f3f224d1f0364dfeff0 /core/java/android
parent48426d5943b757bc8929b297d77baec881f6e7d0 (diff)
parentdea471ef548f09e04e178c5ec2d71a4b79bdb8f8 (diff)
Merge "Added Data roaming user restriction"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/UserManager.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 887dd17ebae9..d1b3f590b024 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -518,6 +518,16 @@ public class UserManager {
public static final String DISALLOW_CAMERA = "no_camera";
/**
+ * Specifies if a user is not allowed to use cellular data when roaming. This can only be set by
+ * device owners. The default value is <code>false</code>.
+ *
+ * @see DevicePolicyManager#addUserRestriction(ComponentName, String)
+ * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
+ * @see #getUserRestrictions()
+ */
+ public static final String DISALLOW_DATA_ROAMING = "no_data_roaming";
+
+ /**
* Allows apps in the parent profile to handle web links from the managed profile.
*
* This user restriction has an effect only in a managed profile.