commit 3e492b87669dfa27a958726473fa1aa876c34f06
author Devin Moore <devinmoore@google.com> Tue Feb 06 21:11:20 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 06 21:11:20 2024 +0000
tree 76c5557dee4e4559c3e4a674b51f461a550e2f26
parent f54ef11f727c26327342ef97a49543bffedb029b
parent 7e7ca03e860a1a6daa0b5f1ab86a416ff32364cb

Merge "Check Media c2 AIDL flag only for older devices" into main

media/codec2/hal/common/HalSelection.cpp

diff --git a/media/codec2/hal/common/HalSelection.cpp b/media/codec2/hal/common/HalSelection.cpp
index 761a409..d3ea181 100644
--- a/media/codec2/hal/common/HalSelection.cpp
+++ b/media/codec2/hal/common/HalSelection.cpp
@@ -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;
     }