commit 2fdd741515ba1c4ae1f62853e309a6ea3973ed36
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 19 10:33:23 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 19 10:33:23 2021 +0000
tree 1b083df123e5366c6c092274189e0e5df12aaf01
parent 0ab3a324c996f65141424232298bf36f8341b018
parent 599043a2356e801da02f7d246227c389c85151bb

Merge "Unbundled test apps can obtain virtual machine permissions"

demo/Android.bp

diff --git a/demo/Android.bp b/demo/Android.bp
index 749ca90..1342a26 100644
--- a/demo/Android.bp
+++ b/demo/Android.bp
@@ -19,5 +19,4 @@
     platform_apis: true,
     use_embedded_native_libs: true,
     v4_signature: true,
-    certificate: "platform",
 }

demo/AndroidManifest.xml

diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml
index 7e1a58d..74ec210 100644
--- a/demo/AndroidManifest.xml
+++ b/demo/AndroidManifest.xml
@@ -6,7 +6,8 @@
 
     <application
         android:label="MicrodroidDemo"
-        android:theme="@style/Theme.MicrodroidDemo">
+        android:theme="@style/Theme.MicrodroidDemo"
+        android:testOnly="true">
         <uses-library android:name="android.system.virtualmachine" android:required="true" />
         <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>

javalib/AndroidManifest.xml

diff --git a/javalib/AndroidManifest.xml b/javalib/AndroidManifest.xml
index f96b39f..2a0b903 100644
--- a/javalib/AndroidManifest.xml
+++ b/javalib/AndroidManifest.xml
@@ -18,7 +18,7 @@
   package="com.android.virtualmachine.res">
 
   <permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE"
-      android:protectionLevel="signature" />
+      android:protectionLevel="signature|development" />
 
   <permission android:name="android.permission.DEBUG_VIRTUAL_MACHINE"
       android:protectionLevel="signature" />