Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cb9201d authored by Florian Mayer's avatar Florian Mayer Committed by Android (Google) Code Review
Browse files

Merge "Go back to default MTE state if no longer controlled by policy." into main

parents dcc9b91c e6a1612d

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

+4 −0
Original line number Diff line number Diff line
@@ -23128,6 +23128,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    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());