Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear policy cache during DO removal" into sc-dev am: 0a551e8a9a am: a26a056a17 am: 0258912c75

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703333

Change-Id: Ifb50cd802c569f1c8632cae125e4fff8a828f21c
This commit is contained in:
Rubin Xu
2021-05-25 13:22:45 +00:00
committed by Automerger Merge Worker
parent 4f801baaf9 0258912c75
commit 4c3dcfbc48
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java
View File

@@ -1190,7 +1190,7 @@ class ActiveAdmin {
pw.println(mEnrollmentSpecificId);
}
pw.print("mAdminCanGrantSensorsPermissions");
pw.print("mAdminCanGrantSensorsPermissions=");
pw.println(mAdminCanGrantSensorsPermissions);
pw.print("mUsbDataSignaling=");

1
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -8579,6 +8579,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final DevicePolicyData policyData = getUserData(userId);
policyData.mCurrentInputMethodSet = false;
saveSettingsLocked(userId);
mPolicyCache.onUserRemoved(userId);
final DevicePolicyData systemPolicyData = getUserData(UserHandle.USER_SYSTEM);
systemPolicyData.mLastSecurityLogRetrievalTime = -1;
systemPolicyData.mLastBugReportRequestTime = -1;