Merge "[AAPM] Add advanced protection dialog according to API feedback" into main

This commit is contained in:
Azhara Assanova
2024-12-19 09:41:27 -08:00
committed by Android (Google) Code Review
7 changed files with 100 additions and 22 deletions

View File

@@ -4459,6 +4459,19 @@
</intent-filter>
</activity>
<activity android:name=".security.ActionDisabledByAdvancedProtectionDialog"
android:theme="@style/Theme.AlertDialog"
android:taskAffinity="com.android.settings.security"
android:excludeFromRecents="true"
android:exported="false"
android:launchMode="singleTop"
android:featureFlag="android.security.aapm_api">
<intent-filter android:priority="1">
<action android:name="android.security.advancedprotection.action.SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="Settings$ManageExternalStorageActivity"
android:knownActivityEmbeddingCerts="@array/config_known_host_certs"