commit 56e9b25b5f511bc6c139001513d9343fba255df8
author Tsung-Mao Fang <tmfang@google.com> Wed Mar 16 18:03:40 2022 +0800
committer Tsung-Mao Fang <tmfang@google.com> Wed Mar 16 18:03:40 2022 +0800
tree bd42a238cf05a21e04b0f838023ce59e49548ab8
parent b65ba009036e3b32f5a8962d925ef6a5d611b367

Set higher priority for ADD_DEVICE_ADMIN intent

Settings should set android:priority of the intent-filter > 1
so that regular apps can't provide an alternative.

Test: Rebuilt apk
Fix: 197960672
Change-Id: Ic12db4fa5e6a5f803930deba2a81254c375403df

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 214d32a..9986e34 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1846,7 +1846,7 @@
                   android:exported="true"
                   android:clearTaskOnLaunch="true"
                   android:theme="@style/Theme.Settings.NoActionBar">
-            <intent-filter>
+            <intent-filter android:priority="1000">
                 <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>