diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-12-17 18:54:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-17 18:54:55 +0000 |
| commit | f2bd50b2ec0e5d7a25694170e0dc1363465fd24e (patch) | |
| tree | 10a41c813e67507cbfc5dde82064e99c5a71e0f1 /core/java/android/app/admin | |
| parent | ee8feae5d4624e6759e264cc80eac28b0d0af20f (diff) | |
| parent | fc7b4444629d9166e3fda7b28e96394356bcf56d (diff) | |
| download | frameworks_base-f2bd50b2ec0e5d7a25694170e0dc1363465fd24e.zip frameworks_base-f2bd50b2ec0e5d7a25694170e0dc1363465fd24e.tar.gz frameworks_base-f2bd50b2ec0e5d7a25694170e0dc1363465fd24e.tar.bz2 | |
Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/app/admin')
| -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 |