Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 47cbcd7

* commit '47cbcd7740739796aef113646861ff7e79439a9c':
  Fix the doc of addCrossProfileIntentFilter.
This commit is contained in:
Nicolas Prevot
2014-12-17 19:01:18 +00:00
committed by android-build-merger
parent c266f62fd9 47cbcd7740
commit 237637e22b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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