| commit | 7d0e1f8065cc618ed8931f070777cda366e65fd0 | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Wed Jan 17 10:47:29 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 17 10:47:29 2018 +0000 |
| tree | ba36fd49fab0dc3beadb8e4dcb0b32c8aa30ceb9 | |
| parent | d7330ca1100b9cfa494513d6c19600217e6a4d23 [diff] | |
| parent | 832ccb07aa6b8c7ff23d148da26cfed5c8957149 [diff] |
Merge "Also inform activity manager that lock task packages changed"
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 38d423d..62a97f8 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 @@ 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);