commit d28e148bd945fd914fd1fb859f35ea096d534c74
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 05 02:38:21 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 05 02:38:21 2022 +0000
tree cbe82aaab8929c72d370fb8f0973a4796b13c1eb
parent 405dde599baff72075c8438e1a2f66c1551ca15e
parent 9fa640939998c402f64f083b2e97478f4eb431a2

Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d am: ea4f257004 am: e0ceb9de72 am: 9fa6409399

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

Change-Id: Ie6e85c998b8aee1a05b0ddec7d88de7d5a56e419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 3b862ff..8ba866e 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -646,6 +646,7 @@
 
     <!-- Permission required to run the `vm` tool which manages on-device virtual machines -->
     <uses-permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE" />
+    <uses-permission android:name="android.permission.USE_CUSTOM_VIRTUAL_MACHINE" />
     <uses-permission android:name="android.permission.DEBUG_VIRTUAL_MACHINE" />
 
     <!-- Permission required to run GtsAssistantTestCases -->