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

Commit 9b860951 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Revert "Disable checking AVB in runtime vintf" 

This reverts commit c524fc8f.

Recovery will use the same API to verify an OTA package, where AVB
check shouldn't be skipped.

Bug: 68016134
Test: Boot device
Change-Id: I4f9b02dfaa5224e492c5efb8c9911b04c949dc9b
parent b57c3db7

core/jni/android_os_VintfObject.cpp

+1 −4
Original line number Diff line number Diff line
@@ -102,11 +102,8 @@ static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray pack 
        cPackageInfo[i] = cString;

        env->ReleaseStringUTFChars(element, cString);

    }

    // If we can run this code, the device should already pass AVB.

    // So, we don't need to check AVB here.

    std::string error;

    int32_t status = VintfObject::CheckCompatibility(

        cPackageInfo, &error, ::android::vintf::DISABLE_AVB_CHECK);

    int32_t status = VintfObject::CheckCompatibility(cPackageInfo, &error);

    if (status)

        LOG(WARNING) << "VintfObject.verify() returns " << status << ": " << error;

    return status;