diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-12-17 19:07:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 19:07:50 +0000 |
| commit | 743a68fc5f62c645d442aa8b3c9ba7e7d9361785 (patch) | |
| tree | 8c086fafe339c242baf36e587cb7e35073cff4a8 /core/java/android/app | |
| parent | acf874112a805dc4cfaf025c6ecb894cb9d79225 (diff) | |
| parent | 237637e22ba9d98171f32d2302b9f532120729a9 (diff) | |
| download | frameworks_base-743a68fc5f62c645d442aa8b3c9ba7e7d9361785.zip frameworks_base-743a68fc5f62c645d442aa8b3c9ba7e7d9361785.tar.gz frameworks_base-743a68fc5f62c645d442aa8b3c9ba7e7d9361785.tar.bz2 | |
am 237637e2: am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev automerge: 47cbcd7
* commit '237637e22ba9d98171f32d2302b9f532120729a9':
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 df6cc73..ae32311 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2803,6 +2803,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 |