summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Benjamin Franz <bfranz@google.com> 2018-01-17 10:47:29 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-01-17 10:47:29 +0000
commit7d0e1f8065cc618ed8931f070777cda366e65fd0 (patch)
treeba36fd49fab0dc3beadb8e4dcb0b32c8aa30ceb9
parentd7330ca1100b9cfa494513d6c19600217e6a4d23 (diff)
parent832ccb07aa6b8c7ff23d148da26cfed5c8957149 (diff)
Merge "Also inform activity manager that lock task packages changed"
-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 38d423da522c..62a97f8cdcfb 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7333,6 +7333,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);