Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 237637e2 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by android-build-merger
Browse files

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

automerge: 47cbcd77

* commit '47cbcd77':
  Fix the doc of addCrossProfileIntentFilter.
parents c266f62f 47cbcd77

core/java/android/app/admin/DevicePolicyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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