commit 8464f26b22c135c6a70aacfdd5934f031bba63d3
author Kyle Zhang <kelzhan@google.com> Tue Mar 01 05:14:20 2022 +0000
committer Kyle Zhang <kelzhan@google.com> Fri Mar 04 23:32:18 2022 +0000
tree 6f34755c74d066b2293ef909d6ab7a0ad4cf8ce1
parent 09f2ec51d88ee438e1e272e6b8ea7d0d13039333

Change testClearKeyGetKeyRequest jni to check aidl version property

Bug: 219395523
Test: CtsMediaDrmTestCases
Change-Id: Ic10f7fc02d6ee8d4f5ed963b64c472b758b513d2

tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp

diff --git a/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp b/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp
index 40584b6..630c7f6 100644
--- a/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp
+++ b/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp
@@ -27,7 +27,6 @@
 #include <jni.h>
 #include <nativehelper/JNIHelp.h>
 #include <sys/stat.h>
-
 #include <android/native_window_jni.h>
 
 #include "AMediaObjects.h"
@@ -1041,6 +1040,17 @@
             return JNI_FALSE;
     }
 
+    // Check service availability
+    const char *outValue = NULL;
+    status = AMediaDrm_getPropertyString(aMediaObjects.getDrm(),
+            "aidlVersion", &outValue);
+    if (status != AMEDIA_OK) {
+        // Drm service not using aidl interface, skip checking default url value
+        return JNI_TRUE;
+    }
+
+    ALOGD("aidlVersion is [%s]", outValue);
+
     ALOGD("kDefaultUrl [%s], length %d, defaultUrl [%s], length %d",
         kDefaultUrl,
         (int)strlen(kDefaultUrl),