| commit | 776358642cbd0ef26aa87c44136f91fcac8aa56b | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Fri Feb 03 01:52:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 03 01:52:09 2023 +0000 |
| tree | fc741afb3bdc2d3210bdc45dad177a7e193a3dd5 | |
| parent | b8a57cc6b89452b0ed27363a3d8af4d838ede14d [diff] | |
| parent | 7dbaedfcb0116d308521624d110a3f88c8c77107 [diff] |
DrmHalTest: null check for skipped test am: 9049fc93a8 am: 6f60eece49 am: 7eebef2366 am: 7dbaedfcb0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2417394 Change-Id: Id88774f654e4b3e3f5f2240017e0e1ee04a1bd38 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);