| commit | 92e1b25a29738386873379365a3601653b8eb158 | [log] [tgz] |
|---|---|---|
| author | Florian Mayer <fmayer@google.com> | Thu Apr 03 18:36:04 2025 -0700 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Mon Apr 07 20:00:34 2025 -0700 |
| tree | 2fd81a1b1ad4d790d9c31fb5613e25a8a06982d9 | |
| parent | 294b12a39b0ec2b9d8cf56f8094a5952c519fc32 [diff] |
Fix crash if device policy disables MTE Flag: EXEMPT bugfix Test: set device policy using TestDPC, observe crash is gone Bug: 407990172 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec6b4842bef8f6f29989bb370d44499a70d6172e) Merged-In: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b Change-Id: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b
diff --git a/res/xml/more_security_privacy_settings.xml b/res/xml/more_security_privacy_settings.xml index 56706c3..a3725c5 100644 --- a/res/xml/more_security_privacy_settings.xml +++ b/res/xml/more_security_privacy_settings.xml
@@ -224,7 +224,7 @@ settings:keywords="@string/keywords_app_pinning" settings:controller="com.android.settings.security.ScreenPinningPreferenceController" /> - <Preference + <com.android.settingslib.RestrictedPreference android:order="300" android:id="@+id/memtag_page" android:key="memtag_page"