diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-05-01 16:16:46 +0100 |
|---|---|---|
| committer | Nicolas Prevot <nprevot@google.com> | 2014-05-06 12:37:20 +0100 |
| commit | 6fee7d4cf991a8d39bdefb782937250c87f60f25 (patch) | |
| tree | e2728959352932e360e44e620de8e5dfbb83aad0 /services/devicepolicy/java | |
| parent | da25a59a19b668b1a2c36e10ee8747fc7dd6867d (diff) | |
| download | frameworks_base-6fee7d4cf991a8d39bdefb782937250c87f60f25.zip frameworks_base-6fee7d4cf991a8d39bdefb782937250c87f60f25.tar.gz frameworks_base-6fee7d4cf991a8d39bdefb782937250c87f60f25.tar.bz2 | |
Introducing removable and non-removable ForwardingIntentFilters.
clearForwardingIntentFilters removes only non-removable IntentFilters.
The ForwardingIntentFilters set by the profile owner are always removable.
Change-Id: If950ccd7e69261b86360ea647fdb501c92f5440b
Diffstat (limited to 'services/devicepolicy/java')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index d0a6db1..ae2dcf9 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3094,10 +3094,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { long id = Binder.clearCallingIdentity(); try { if ((flags & DevicePolicyManager.FLAG_TO_PRIMARY_USER) != 0) { - pm.addForwardingIntentFilter(filter, callingUserId, UserHandle.USER_OWNER); + pm.addForwardingIntentFilter(filter, true /*removable*/, callingUserId, + UserHandle.USER_OWNER); } if ((flags & DevicePolicyManager.FLAG_TO_MANAGED_PROFILE) != 0) { - pm.addForwardingIntentFilter(filter, UserHandle.USER_OWNER, callingUserId); + pm.addForwardingIntentFilter(filter, true /*removable*/, UserHandle.USER_OWNER, + callingUserId); } } catch (RemoteException re) { // Shouldn't happen |