From 832ccb07aa6b8c7ff23d148da26cfed5c8957149 Mon Sep 17 00:00:00 2001
From: Benjamin Franz <bfranz@google.com>
Date: Tue, 16 Jan 2018 15:47:18 +0000
Subject: [PATCH] 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
---
 .../android/server/devicepolicy/DevicePolicyManagerService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index bf2b137f65b86..d4ef3155afb0d 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);