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

Commit a67b5edf authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Check Media c2 AIDL flag only for older devices" into main am: 3e492b87 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2951267



Change-Id: Ic5f3a8a5a4f50f4cf5ef6c9e6d2a984bf52a7588
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e975b35 3e492b87

media/codec2/hal/common/HalSelection.cpp

+6 −1
Original line number Diff line number Diff line
@@ -28,7 +28,12 @@ 
namespace android {



bool IsCodec2AidlHalSelected() {

    if (!com::android::media::codec::flags::provider_->aidl_hal()) {

    // For new devices with vendor software targeting 202404, we always want to

    // use AIDL if it exists

    constexpr int kAndroidApi202404 = 202404;

    int vendorVersion = ::android::base::GetIntProperty("ro.vendor.api_level", -1);

    if (!com::android::media::codec::flags::provider_->aidl_hal() &&

        vendorVersion < kAndroidApi202404) {

        // Cannot select AIDL if not enabled

        return false;

    }