Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement permission check for virtualizationservice" am: 1ce000ff84 am: 01dfd737f5

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

Change-Id: I81519001e9e2dae4eef2b38327858281e44d1886
This commit is contained in:
Jiyong Park
2021-07-13 16:09:29 +00:00
committed by Automerger Merge Worker
parent 8250841a19 01dfd737f5
commit da0ffb8e4f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/Android.bp
View File

@@ -313,6 +313,10 @@ aidl_interface {
backend: { backend: {
rust: { rust: {
enabled: true, enabled: true,
apex_available: [
"//apex_available:platform",
"com.android.virt", // for virtualizationservice
],
}, },
}, },
} }

4
packages/Shell/AndroidManifest.xml
View File

@@ -571,6 +571,10 @@
<!-- Permission required for GTS test - PendingSystemUpdateTest --> <!-- Permission required for GTS test - PendingSystemUpdateTest -->
<uses-permission android:name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> <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" <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"