summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-05-23 21:28:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-23 21:28:01 +0000
commit82d5d3dee4a3831b6b7cd5c72de44202bacdbb32 (patch)
treef0aae144a2400d17be48581691e5ed874a277abe
parentd8700bfabf59b5ccdb1edf1e7acd67aeaf4719e8 (diff)
parente5b515e39ba02d47b34a832c3ab1d5c98dd7f83f (diff)
Merge "Clear canAdminGrantSensorPermissions on DO removal." into udc-dev
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 2846b394e6e7..c96bfd716297 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 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
mOwners.clearDeviceOwner();
mOwners.writeDeviceOwner();
+ updateAdminCanGrantSensorsPermissionCache(userId);
clearDeviceOwnerUserRestriction(UserHandle.of(userId));
mInjector.securityLogSetLoggingEnabledProperty(false);
mSecurityLogMonitor.stop();