diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-06-09 13:01:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-09 13:01:09 +0000 |
| commit | e8b8f99dde2aea3958d3169627e1fe2b02d8627b (patch) | |
| tree | c59a40fba5ed29e22a64e2877c7382833429210d /core/java/android/app | |
| parent | 1e7bdd7174700683c2eab6c5c54897d0adeed5d6 (diff) | |
| parent | 41d926e3e4dc5b6a7f21f56168d222df562a5ebd (diff) | |
| download | frameworks_base-e8b8f99dde2aea3958d3169627e1fe2b02d8627b.zip frameworks_base-e8b8f99dde2aea3958d3169627e1fe2b02d8627b.tar.gz frameworks_base-e8b8f99dde2aea3958d3169627e1fe2b02d8627b.tar.bz2 | |
Merge "Updating documentation for the flags 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 34fa609..aac55c7 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2050,6 +2050,8 @@ public class DevicePolicyManager { * @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 + * @param flags {@link DevicePolicyManager#FLAG_MANAGED_CAN_ACCESS_PARENT} and + * {@link DevicePolicyManager#FLAG_PARENT_CAN_ACCESS_MANAGED} are supported. */ public void addCrossProfileIntentFilter(ComponentName admin, IntentFilter filter, int flags) { if (mService != null) { |