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

Commit f32a631f authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

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

am: 24bb49fa

Change-Id: I6ac10763ea800816e1eb77579d0321d1ecf58f0b
parents ada90d75 24bb49fa

core/jni/android_os_VintfObject.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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<std::string> 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) {