Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev

2014-12-17 18:54:53 +00:00
parent ee8feae5d4 fc7b444462
commit f2bd50b2ec
1 changed files with 2 additions and 0 deletions
--- 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