diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-01-15 00:12:18 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-01-15 00:12:18 +0100 |
| commit | 568e54be71731bdbcd5338385eb6cc6a082c9456 (patch) | |
| tree | 9cbbe50e8824a72d7afda5ef75a45584742e200a /core/java/android/app | |
| parent | 4bc5b2bce9b1e3483357966f4ef074391565255f (diff) | |
| parent | 87f536948c06e57d2f9e78f39c01272cb08de1f1 (diff) | |
| download | frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.zip frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.tar.gz frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.tar.bz2 | |
resolve merge conflicts of 87f5369 to master.
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
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 c5c6d06..69872ff 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -469,20 +469,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; |