From 65d1bd15fec0b723de7e97dff11f18e2c198c696 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 8 Aug 2018 13:15:18 -0700 Subject: [PATCH] VintfObject: DisabledChecks -> CheckFlags. Reflects a name change. Bug: 110711640 Test: boots Change-Id: I1f0d2821e8f18444235fa94814ad893220f9833d --- core/jni/android_os_VintfObject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index 17ab9563d3720..e64d2afe7bf3b 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp @@ -96,7 +96,7 @@ static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass) 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 cPackageInfo; if (packageInfo) { size_t count = env->GetArrayLength(packageInfo); @@ -116,11 +116,11 @@ static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::Disabl } 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) {