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

Commit fc9b8014 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear canAdminGrantSensorPermissions on DO removal." into udc-dev am: 82d5d3de 

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



Change-Id: Ic039609d42dfb4890fdd9a9d2742d12585442382
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e56b2573 82d5d3de

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

+1 −0
Original line number Diff line number Diff line
@@ -10117,6 +10117,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        mOwners.clearDeviceOwner();

        mOwners.writeDeviceOwner();













        updateAdminCanGrantSensorsPermissionCache(userId);















        clearDeviceOwnerUserRestriction(UserHandle.of(userId));















        mInjector.securityLogSetLoggingEnabledProperty(false);















        mSecurityLogMonitor.stop();