summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Benjamin Franz <bfranz@google.com> 2018-01-16 15:47:18 +0000
committer Benjamin Franz <bfranz@google.com> 2018-01-16 15:47:18 +0000
commit832ccb07aa6b8c7ff23d148da26cfed5c8957149 (patch)
treeb36c9c76946367cb5f9dcf3c5643792c3182dcb9
parentc539b9b841bc35e09560b5c3eed4944c7e4ef951 (diff)
Also inform activity manager that lock task packages changed
When user data is cleared in DevicePolicyManager, we clear the lock task packages list. We should also forward that information to the ActivityManager, so they can do relevant clean up; in particular this will stop any running lock tasks. Bug: 68688028 Test: manual Change-Id: I0f40e7e08efd5ad2ca20b50ffa1032ddb13d1adb
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index bf2b137f65b8..d4ef3155afb0 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7319,6 +7319,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
policy.mUserProvisioningState = DevicePolicyManager.STATE_USER_UNMANAGED;
policy.mAffiliationIds.clear();
policy.mLockTaskPackages.clear();
+ updateLockTaskPackagesLocked(policy.mLockTaskPackages, userId);
policy.mLockTaskFeatures = DevicePolicyManager.LOCK_TASK_FEATURE_NONE;
saveSettingsLocked(userId);