commit 24bb49fa09c9b7ba57f844babcd68bee1d0e6af8
author Yifan Hong <elsk@google.com> Thu Aug 09 14:15:30 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 09 14:15:30 2018 -0700
tree a853e6177da8e4ad5fe90c7bc92e63cb9aa83002
parent 24c969b16d7336e5a262fc1e3548f76db74cd2d5
parent c4ee8133d1ea6b47d2c2c170f55676c033d5c427

Merge "VintfObject: DisabledChecks -> CheckFlags."
am: c4ee8133d1

Change-Id: I1e341f4c3490e63d1a0f0cf6470efe42af7b9cc6

core/jni/android_os_VintfObject.cpp

diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp
index 17ab956..e64d2af 100644
--- a/core/jni/android_os_VintfObject.cpp
+++ b/core/jni/android_os_VintfObject.cpp
@@ -96,7 +96,7 @@
     return toJavaStringArray(env, cStrings);
 }
 
-static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::DisabledChecks checks) {
+static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::CheckFlags::Type checks) {
     std::vector<std::string> cPackageInfo;
     if (packageInfo) {
         size_t count = env->GetArrayLength(packageInfo);
@@ -116,11 +116,11 @@
 }
 
 static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) {
-    return verify(env, packageInfo, ::android::vintf::ENABLE_ALL_CHECKS);
+    return verify(env, packageInfo, ::android::vintf::CheckFlags::ENABLE_ALL_CHECKS);
 }
 
 static jint android_os_VintfObject_verifyWithoutAvb(JNIEnv* env, jclass) {
-    return verify(env, nullptr, ::android::vintf::DISABLE_AVB_CHECK);
+    return verify(env, nullptr, ::android::vintf::CheckFlags::DISABLE_AVB_CHECK);
 }
 
 static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, jclass) {