commit e5b515e39ba02d47b34a832c3ab1d5c98dd7f83f
author Elis Elliott <eliselliott@google.com> Mon May 22 16:32:33 2023 +0000
committer Elis Elliott <eliselliott@google.com> Mon May 22 16:32:33 2023 +0000
tree 76faf93c8c3b6e5c576092a0c4e3278a49a7da8e
parent b130b003a543d8c9c17379fdfaa2686b65cc3cc4

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

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 8f7e292..6fa6a54 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 @@
         mOwners.clearDeviceOwner();
         mOwners.writeDeviceOwner();
 
+        updateAdminCanGrantSensorsPermissionCache(userId);
         clearDeviceOwnerUserRestriction(UserHandle.of(userId));
         mInjector.securityLogSetLoggingEnabledProperty(false);
         mSecurityLogMonitor.stop();