From 8b9d79269214b32179e9702e8b682c4f205efd52 Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Fri, 2 Dec 2022 16:01:29 -0800 Subject: [PATCH] [MTE] allow device policy to control setting Test: unit tests Test: TestDPC with COPE and DO Test: make RunSettingsRoboTests Bug: 244290023 Change-Id: I0e03d0dbe44ef595d813652f85529c1fe5fd6cec --- res/xml/memtag_page.xml | 2 +- res/xml/security_advanced_settings.xml | 2 +- .../MemtagPagePreferenceController.java | 8 +++ .../security/MemtagPreferenceController.java | 10 +++ .../MemtagPagePreferenceControllerTest.java | 66 +++++++++++++++++++ .../MemtagPreferenceControllerTest.java | 13 +++- .../ShadowRestrictedLockUtilsInternal.java | 11 ++++ 7 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/security/MemtagPagePreferenceControllerTest.java diff --git a/res/xml/memtag_page.xml b/res/xml/memtag_page.xml index 6255b43385a..bad53c9fb35 100644 --- a/res/xml/memtag_page.xml +++ b/res/xml/memtag_page.xml @@ -23,7 +23,7 @@ android:title="@string/memtag_intro" settings:searchable="false"/> - -