From 0e9bbf8aae8dc455ffcd5395fee6643406f4941d Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Mon, 24 May 2021 15:30:33 +0100 Subject: [PATCH] Clear policy cache during DO removal Remove left-over polices (such as mCanGrantSensorsPermissions) from the cache so it's not interfering with subsequent test runs Bug: 187862351 Bug: 184079462 Bug: 183162232 Bug: 183162329 Test: 1. atest MixedDeviceOwnerTest#testGrantOfSensorsRelatedPermissions 2. atest MixedProfileOwnerTest#testGrantOfSensorsRelatedPermissions Change-Id: I8551fca161c7df39228587a024f468a496dcdb58 --- .../java/com/android/server/devicepolicy/ActiveAdmin.java | 2 +- .../android/server/devicepolicy/DevicePolicyManagerService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java index ff7514a377e54..4bd01f384a63f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java @@ -1193,7 +1193,7 @@ class ActiveAdmin { pw.println(mEnrollmentSpecificId); } - pw.print("mAdminCanGrantSensorsPermissions"); + pw.print("mAdminCanGrantSensorsPermissions="); pw.println(mAdminCanGrantSensorsPermissions); pw.print("mUsbDataSignaling="); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 8089fb1025132..f96799a8e86b6 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -8572,6 +8572,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;