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

Commit b371d253 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Clear policy cache during DO removal" into sc-dev am: 0a551e8a 

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

Change-Id: I056836b07f098fcad8c1428482af2e588b25a229
parents e5bb491c 0a551e8a

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;