Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 467fc191 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" am: 9b6a363c am: c15f5183 

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

Change-Id: I814281ec1817d61b5a8d454cf422c57963c8acb0
parents ae686436 c15f5183

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -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"