From e5b515e39ba02d47b34a832c3ab1d5c98dd7f83f Mon Sep 17 00:00:00 2001
From: Elis Elliott <eliselliott@google.com>
Date: Mon, 22 May 2023 16:32:33 +0000
Subject: [PATCH] Clear canAdminGrantSensorPermissions on DO removal.

Fixes: 281741693

Test: atest
com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSensorsRelatedPermissionsNotGrantedViaPolicy
 then
atest
com.android.cts.devicepolicy.MixedProfileOwnerTest#testSensorsRelatedPermissionsNotGrantedViaPolicyBug

Change-Id: I136d5f3eec59e29d6ba4250b8f0ca3255104e6ea
---
 .../android/server/devicepolicy/DevicePolicyManagerService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 8f7e29280e6f6..6fa6a54426cff 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -10116,6 +10116,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
         mOwners.clearDeviceOwner();
         mOwners.writeDeviceOwner();
 
+        updateAdminCanGrantSensorsPermissionCache(userId);
         clearDeviceOwnerUserRestriction(UserHandle.of(userId));
         mInjector.securityLogSetLoggingEnabledProperty(false);
         mSecurityLogMonitor.stop();