diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-01-12 12:32:56 +0000 |
|---|---|---|
| committer | Nicolas Prevot <nprevot@google.com> | 2015-01-14 10:31:23 +0000 |
| commit | 2c1c5dd5ef75183101ec22d424b2d11f6b52b61b (patch) | |
| tree | 8b5def2a2b5f50386d112f1c141b34d073d5caed /core/java/android/app | |
| parent | c6a228511c15506602b03f96183bb3c06d12163f (diff) | |
| download | frameworks_base-2c1c5dd5ef75183101ec22d424b2d11f6b52b61b.zip frameworks_base-2c1c5dd5ef75183101ec22d424b2d11f6b52b61b.tar.gz frameworks_base-2c1c5dd5ef75183101ec22d424b2d11f6b52b61b.tar.bz2 | |
Make documentation for cross-profile intent filters clearer.
Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.
BUG:18962528
Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 1211260..7e15ec2 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -465,20 +465,20 @@ public class DevicePolicyManager { = "android.app.action.SET_NEW_PASSWORD"; /** - * Flag used by {@link #addCrossProfileIntentFilter} to allow access - * <em>from</em> a managed profile <em>to</em> its parent. That is, any - * matching activities in the parent profile are included in the - * disambiguation list shown when an app in the managed profile calls - * {@link Activity#startActivity(Intent)}. + * Flag used by {@link #addCrossProfileIntentFilter} to allow activities in + * the parent profile to access intents sent from the managed profile. + * That is, when an app in the managed profile calls + * {@link Activity#startActivity(Intent)}, the intent can be resolved by a + * matching activity in the parent profile. */ public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 0x0001; /** - * Flag used by {@link #addCrossProfileIntentFilter} to allow access - * <em>from</em> a parent <em>to</em> its managed profile. That is, any - * matching activities in the managed profile are included in the - * disambiguation list shown when an app in the parent profile calls - * {@link Activity#startActivity(Intent)}. + * Flag used by {@link #addCrossProfileIntentFilter} to allow activities in + * the managed profile to access intents sent from the parent profile. + * That is, when an app in the parent profile calls + * {@link Activity#startActivity(Intent)}, the intent can be resolved by a + * matching activity in the managed profile. */ public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 0x0002; |