commit 82d5d3dee4a3831b6b7cd5c72de44202bacdbb32
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 23 21:28:01 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 23 21:28:01 2023 +0000
tree f0aae144a2400d17be48581691e5ed874a277abe
parent d8700bfabf59b5ccdb1edf1e7acd67aeaf4719e8
parent e5b515e39ba02d47b34a832c3ab1d5c98dd7f83f

Merge "Clear canAdminGrantSensorPermissions on DO removal." into udc-dev

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 2846b39..c96bfd7 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -10117,6 +10117,7 @@
         mOwners.clearDeviceOwner();
         mOwners.writeDeviceOwner();
 
+        updateAdminCanGrantSensorsPermissionCache(userId);
         clearDeviceOwnerUserRestriction(UserHandle.of(userId));
         mInjector.securityLogSetLoggingEnabledProperty(false);
         mSecurityLogMonitor.stop();