Merge "Finish cleanup of CTS-V admin/tapjacking/UsbTest" into udc-dev am: 7a275c61d3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22169184

Change-Id: I8e5edcede1301edb972dba00d9c93deb4fd8c994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mark Renouf
2023-03-22 19:40:52 +00:00
committed by Automerger Merge Worker

View File

@@ -635,12 +635,6 @@
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true">
</activity>
<activity-alias
android:name=".UsbDebuggingActivityAlias"
android:permission="android.permission.DUMP"
android:targetActivity=".usb.UsbDebuggingActivity"
android:exported="true">
</activity-alias>
<activity android:name=".usb.UsbDebuggingSecondaryUserActivity"
android:theme="@style/Theme.SystemUI.Dialog.Alert"
android:finishOnCloseSystemDialogs="true"