| commit | 652101329ef3cf8e13de2ea56680e05e128ef021 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Fri Feb 03 00:10:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 03 00:10:05 2023 +0000 |
| tree | 0a60d6d1d2fcea67464c3ab7ba15431ac99aa451 | |
| parent | 303092c46f33f8ba0ce0f9df1bc43b8a7f4bcebd [diff] | |
| parent | efe8d1a7a4ca6bd00b24411898721bd61feb485d [diff] |
DrmHalTest: null check for skipped test am: 9049fc93a8 am: efe8d1a7a4 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2417394 Change-Id: I885e3f4829b72bf8ba4e7d99dad0c85a06f3b465 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);