diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-06-29 17:08:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 17:08:34 +0000 |
| commit | 6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa (patch) | |
| tree | 901bc3c9c27bd70d4ff1b42d00b3c24367722160 /core/java | |
| parent | cadf3969c313bd0e354157eef9e0bcc552cb0c8a (diff) | |
| parent | f0029c1ddb2875583e62c6a3f96d288e21f2efe2 (diff) | |
| download | frameworks_base-6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa.zip frameworks_base-6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa.tar.gz frameworks_base-6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa.tar.bz2 | |
Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 9770941..6384af3 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -449,6 +449,8 @@ public class UserManager { public static final String DISALLOW_RECORD_AUDIO = "no_record_audio"; /** + * 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. * If set: * Intent filters of activities in the parent profile with action @@ -462,7 +464,8 @@ public class UserManager { * @see #setUserRestrictions(Bundle) * @see #getUserRestrictions() */ - public static final String ALLOW_PARENT_APP_LINKING = "allow_parent_app_linking"; + public static final String ALLOW_PARENT_PROFILE_APP_LINKING + = "allow_parent_profile_app_linking"; /** * Application restriction key that is used to indicate the pending arrival |