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

Commit 0a551e8a authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Clear policy cache during DO removal" into sc-dev

parents dc0fc382 0e9bbf8a

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

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