diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-06-17 11:09:48 -0700 |
|---|---|---|
| committer | Nicolas Prevot <nprevot@google.com> | 2015-06-22 14:39:44 -0700 |
| commit | 9edbda18df025527e18614cf0c45d538a27af30f (patch) | |
| tree | ec9366acabcae184e68031222a23f3eb8cf7fb47 /core | |
| parent | 49e11f805dcf5c8611e4bfbb115e56a22db4a396 (diff) | |
| download | frameworks_base-9edbda18df025527e18614cf0c45d538a27af30f.zip frameworks_base-9edbda18df025527e18614cf0c45d538a27af30f.tar.gz frameworks_base-9edbda18df025527e18614cf0c45d538a27af30f.tar.bz2 | |
Allow cross-profile app linking from work to personal.
If the profile owner sets ALLOW_PARENT_APP_LINKING:
ACTION_VIEW, scheme http/https intents sent from the work profile
can be resolved by personal apps if they specify a host.
BUG:21701782
Change-Id: I372e2405345539eac9d6b4fb08def6bf84da14a6
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/UserManager.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 00350ec..9770941 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -449,6 +449,22 @@ public class UserManager { public static final String DISALLOW_RECORD_AUDIO = "no_record_audio"; /** + * This user restriction has an effect only in a managed profile. + * If set: + * Intent filters of activities in the parent profile with action + * {@link android.content.Intent#ACTION_VIEW}, + * category {@link android.content.Intent#CATEGORY_BROWSABLE}, scheme http or https, and which + * define a host can handle intents from the managed profile. + * The default value is <code>false</code>. + * + * <p/>Key for user restrictions. + * <p/>Type: Boolean + * @see #setUserRestrictions(Bundle) + * @see #getUserRestrictions() + */ + public static final String ALLOW_PARENT_APP_LINKING = "allow_parent_app_linking"; + + /** * Application restriction key that is used to indicate the pending arrival * of real restrictions for the app. * |
