commit da6de0384f43f4ef065628d024d47b4bbc88ffda
author Robert Shih <robertshih@google.com> Fri Jan 20 20:12:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 20 20:12:27 2023 +0000
tree 95da5bfafdfad59cbf2995947f1e9fdc92163f0a
parent 6c2f844b50fd714b80d99a32709bbc6636e71756
parent 38d04b08afe0f52506d7a211c2b975c3f616b16f

Merge "DrmStatus type checks" am: b549ebce63 am: ae81ba6d9e am: 38d04b08af

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2395532

Change-Id: I5db18ae9648d1be64ad7922ab8339a27e5ab684a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

drm/libmediadrm/DrmStatus.cpp

diff --git a/drm/libmediadrm/DrmStatus.cpp b/drm/libmediadrm/DrmStatus.cpp
index 0258801..f622160 100644
--- a/drm/libmediadrm/DrmStatus.cpp
+++ b/drm/libmediadrm/DrmStatus.cpp
@@ -27,21 +27,20 @@
         return;
     }
 
-    std::string errMsg;
     auto val = errorDetails["cdmError"];
-    if (!val.isNull()) {
+    if (val.isInt()) {
         mCdmErr = val.asInt();
     }
     val = errorDetails["oemError"];
-    if (!val.isNull()) {
+    if (val.isInt()) {
         mOemErr = val.asInt();
     }
     val = errorDetails["context"];
-    if (!val.isNull()) {
+    if (val.isInt()) {
         mCtx = val.asInt();
     }
     val = errorDetails["errorMessage"];
-    if (!val.isNull()) {
+    if (val.isString()) {
         mErrMsg = val.asString();
     } else {
         mErrMsg = msg;