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

Commit e96e8c2b authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "Implement permission check for virtualizationservice" am: 1ce000ff... 

Merge "Implement permission check for virtualizationservice" am: 1ce000ff am: 01dfd737 am: da0ffb8e

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

Change-Id: Ib61226630273436d11d11d0d2a944fad930cc46a
parents 31a82304 da0ffb8e

core/java/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -313,6 +313,10 @@ aidl_interface { 
    backend: {

        rust: {

            enabled: true,

            apex_available: [

                "//apex_available:platform",

                "com.android.virt", // for virtualizationservice

            ],

        },

    },

}

packages/Shell/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -571,6 +571,10 @@ 
    <!-- Permission required for GTS test - PendingSystemUpdateTest -->

    <uses-permission android:name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" />



    <!-- 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.DEBUG_VIRTUAL_MACHINE" />



    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"