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
This commit is contained in:
Nicolas Prevot
2015-01-12 12:32:56 +00:00
parent c6a228511c
commit 2c1c5dd5ef

View File

@@ -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;