commit b4ec19d062c15b6005eb04abebe1360ab40af312
author Nikita Ioffe <ioffe@google.com> Mon Jan 20 00:44:10 2025 +0000
committer Nikita Ioffe <ioffe@google.com> Wed Jan 29 15:00:34 2025 +0000
tree 66a4fac732f41238f53d24876eee3d538736d5d3
parent e5d4b5259743241777cfa719380f55715e5eacfb

Merge AndroidManifestNext.xml into AndroidManifest.xml

Changes in AndroidManifestNext.xml were released as part of Android V,
so it is safe to merge to manifest files into one.

This is a prerequisite to follow up patches.

Bug: 378681279
Bug: 365767108
Test: presubmit
Test: builds
Change-Id: Ic0d6b817233669384619f6c2227625a2f45fccd5

android/android.system.virtualmachine.res/AndroidManifest.xml

diff --git a/android/android.system.virtualmachine.res/AndroidManifest.xml b/android/android.system.virtualmachine.res/AndroidManifest.xml
index 95b9cfa..ebcb8ba 100644
--- a/android/android.system.virtualmachine.res/AndroidManifest.xml
+++ b/android/android.system.virtualmachine.res/AndroidManifest.xml
@@ -20,11 +20,11 @@
   <!-- @SystemApi Allows an application to create and run a Virtual Machine
        using the Virtualization Framework APIs
        (android.system.virtualmachine.*).
-       <p>Protection level: signature|privileged|development
+       <p>Protection level: signature|preinstalled|development
        @hide
   -->
   <permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE"
-      android:protectionLevel="signature|privileged|development" />
+      android:protectionLevel="signature|preinstalled|development" />
 
   <!-- @hide Allows an application to run a Virtual Machine with a custom
        kernel or a Microdroid configuration file.