Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" am: 9b6a363c8c am: c15f518369 am: 467fc19198

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

Change-Id: Ife79af85bc2e8452ae37da6b5ce6da89042718fb
This commit is contained in:
Treehugger Robot
2021-11-19 03:56:38 +00:00
committed by Automerger Merge Worker

View File

@@ -575,6 +575,9 @@
<uses-permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE" /> <uses-permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE" />
<uses-permission android:name="android.permission.DEBUG_VIRTUAL_MACHINE" /> <uses-permission android:name="android.permission.DEBUG_VIRTUAL_MACHINE" />
<!-- Permission required for CTS test - SettingsMultiPaneDeepLinkTest -->
<uses-permission android:name="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK" />
<application android:label="@string/app_label" <application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight" android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"