diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-07-28 13:14:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:35:58 +0000 |
| commit | ddbce3263270c3b66c377be2d9f388fc11b23483 (patch) | |
| tree | e830a24aa79ab34c96fb7c03fec0f751bde29668 /core/java/android/app/admin | |
| parent | af9f8aed7d3955b0d1c75943290467f39c7a7681 (diff) | |
| parent | 3f7777fa4f1d392e18bad39edcd4539880c52ff9 (diff) | |
| download | frameworks_base-ddbce3263270c3b66c377be2d9f388fc11b23483.zip frameworks_base-ddbce3263270c3b66c377be2d9f388fc11b23483.tar.gz frameworks_base-ddbce3263270c3b66c377be2d9f388fc11b23483.tar.bz2 | |
Merge "Storing the app who sets a CrossProfileIntentFilter." into lmp-dev
Diffstat (limited to 'core/java/android/app/admin')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 2d4903c..76cf29a 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2402,8 +2402,9 @@ public class DevicePolicyManager { } /** - * Called by a profile owner to remove the cross-profile intent filters from the managed profile - * and from the parent. + * Called by a profile owner to remove the cross-profile intent filters that go from the + * managed profile to the parent, or from the parent to the managed profile. + * Only removes those that have been set by the profile owner. * @param admin Which {@link DeviceAdminReceiver} this request is associated with. */ public void clearCrossProfileIntentFilters(ComponentName admin) { |