commit e6a1612d6f280d6c4338bab38d1150b6bc94494e
author Florian Mayer <fmayer@google.com> Mon Jan 29 10:19:10 2024 -0800
committer Florian Mayer <fmayer@google.com> Mon Jan 29 13:28:55 2024 -0800
tree 2c3f3e55277de17850929501a5859100d97ca800
parent 8652ad6e147d0d1840fa2b03bcba7159ef86f2cf

Go back to default MTE state if no longer controlled by policy.

Test: TestDPC
Bug: 322733889
Change-Id: Id47ce5cea173a203fcfd80a38b1119e2ef903a43

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 519c9bb..74d544f 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -23128,6 +23128,10 @@
                     mInjector.systemPropertiesSet(memtagProperty, "memtag");
                 } else if (flags == DevicePolicyManager.MTE_DISABLED) {
                     mInjector.systemPropertiesSet(memtagProperty, "memtag-off");
+                } else if (flags == DevicePolicyManager.MTE_NOT_CONTROLLED_BY_POLICY) {
+                    if (admin.mtePolicy != DevicePolicyManager.MTE_NOT_CONTROLLED_BY_POLICY) {
+                        mInjector.systemPropertiesSet(memtagProperty, "default");
+                    }
                 }
                 admin.mtePolicy = flags;
                 saveSettingsLocked(caller.getUserId());