Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e9bbf8a authored by Rubin Xu's avatar Rubin Xu
Browse files

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
parent b04a005c

services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ class ActiveAdmin { 
            pw.println(mEnrollmentSpecificId);

        }



        pw.print("mAdminCanGrantSensorsPermissions");

        pw.print("mAdminCanGrantSensorsPermissions=");

        pw.println(mAdminCanGrantSensorsPermissions);



        pw.print("mUsbDataSignaling=");

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -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;