commit 329f286a36704788e75098fc6dad67dd4cdb0acb
author Seungjae Yoo <seungjaeyoo@google.com> Mon Apr 08 11:21:53 2024 +0900
committer Seungjae Yoo <seungjaeyoo@google.com> Thu Apr 11 13:29:01 2024 +0900
tree 3bb8bb3c836a3a4bcf245695fb21c8b4b0aff8cc
parent cd31a066db22cd69a92d50228579f390eaf23c7c

Add CAP_SYS_NICE to virtmgr to sync with crosvm's capability.

Bug: 328051532
Test: adb shell /apex/com.android.virt/bin/vm run-microdroid
Test: adb logcat | grep virtmgr
Test: atest MicrodroidTestAppNoPerm
Change-Id: I8cf3efb86869a7e3a31bc1ba3480f43c1bc92bf6

java/jni/Android.bp

diff --git a/java/jni/Android.bp b/java/jni/Android.bp
index 74a1766..4a569d4 100644
--- a/java/jni/Android.bp
+++ b/java/jni/Android.bp
@@ -16,6 +16,7 @@
         "liblog",
         "libnativehelper",
     ],
+    static_libs: ["libavf_cc_flags"],
 }
 
 cc_library_shared {

java/jni/android_system_virtualmachine_VirtualizationService.cpp

diff --git a/java/jni/android_system_virtualmachine_VirtualizationService.cpp b/java/jni/android_system_virtualmachine_VirtualizationService.cpp
index fbd1fd5..4f02112 100644
--- a/java/jni/android_system_virtualmachine_VirtualizationService.cpp
+++ b/java/jni/android_system_virtualmachine_VirtualizationService.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "VirtualizationService"
 
 #include <android-base/unique_fd.h>
+#include <android/avf_cc_flags.h>
 #include <android/binder_ibinder_jni.h>
 #include <jni.h>
 #include <log/log.h>
@@ -101,3 +102,9 @@
     }
     return pfds[0].revents == 0;
 }
+
+extern "C" JNIEXPORT jboolean JNICALL
+Java_android_system_virtualmachine_VirtualizationService_nativeIsVendorModulesFlagEnabled(
+        [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
+    return android::virtualization::IsVendorModulesFlagEnabled();
+}