diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-12-17 19:01:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-17 19:01:18 +0000 |
| commit | 237637e22ba9d98171f32d2302b9f532120729a9 (patch) | |
| tree | 480c6ff3ae3037f0889093c6a1ccbe3a0117ae8d /core/java/android/app | |
| parent | c266f62fd9f241b0d122bae7ad016ecd58ab40da (diff) | |
| parent | 47cbcd7740739796aef113646861ff7e79439a9c (diff) | |
| download | frameworks_base-237637e22ba9d98171f32d2302b9f532120729a9.zip frameworks_base-237637e22ba9d98171f32d2302b9f532120729a9.tar.gz frameworks_base-237637e22ba9d98171f32d2302b9f532120729a9.tar.bz2 | |
am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
automerge: 47cbcd7
* commit '47cbcd7740739796aef113646861ff7e79439a9c':
Fix the doc of addCrossProfileIntentFilter.
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index ead89b3..1211260 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2797,6 +2797,8 @@ public class DevicePolicyManager { /** * Called by the profile owner of a managed profile so that some intents sent in the managed * profile can also be resolved in the parent, or vice versa. + * Only activity intents are supported. + * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param filter The {@link IntentFilter} the intent has to match to be also resolved in the * other profile |