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

Commit 3ca617f4 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Release VintfObject memory after compat check at boot time." into main... 

Merge "Release VintfObject memory after compat check at boot time." into main am: 53304658 am: e1cee4e6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2901627



Change-Id: I37a8a2105645b6cb62d933b971642ac9d7fa3948
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6236c01a e1cee4e6

core/jni/android_os_VintfObject.cpp

+4 −1
Original line number Diff line number Diff line
@@ -96,8 +96,11 @@ static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass) 


static jint android_os_VintfObject_verifyBuildAtBoot(JNIEnv* env, jclass) {

    std::string error;

    // Use temporary VintfObject, not the shared instance, to release memory

    // after check.

    int32_t status =

            VintfObject::GetInstance()

            VintfObject::Builder()

                    .build()

                    ->checkCompatibility(&error, ENABLE_ALL_CHECKS.disableAvb().disableKernel());

    if (status)

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