| commit | 6f60eece49dd7d10687aa43321875a5f75effaea | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Feb 02 23:26:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 02 23:26:58 2023 +0000 |
| tree | 90774930c7ffb3f5df70d49837da5bd4a0b3c6cd | |
| parent | 6331fd4d5a2dd70dd54cb9af81e0197a77c78be6 [diff] | |
| parent | 9049fc93a8b2d5ae9f4c1e0316b84abeedb33a31 [diff] |
DrmHalTest: null check for skipped test am: 9049fc93a8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2417394 Change-Id: Ibcc9f17acb7b2d43b24496c07a5ad2992b659977 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/drm/aidl/vts/drm_hal_common.cpp b/drm/aidl/vts/drm_hal_common.cpp index f5ef0e7..f0445a5 100644 --- a/drm/aidl/vts/drm_hal_common.cpp +++ b/drm/aidl/vts/drm_hal_common.cpp
@@ -263,6 +263,9 @@ } bool DrmHalTest::isCryptoSchemeSupported(Uuid uuid, SecurityLevel level, std::string mime) { + if (drmFactory == nullptr) { + return false; + } CryptoSchemes schemes{}; auto ret = drmFactory->getSupportedCryptoSchemes(&schemes); EXPECT_OK(ret);