commit ae81ba6d9e67a12937481dfbcbd1fdc9ebd3d952
author Robert Shih <robertshih@google.com> Fri Jan 20 18:37:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 20 18:37:27 2023 +0000
tree dd23287a4cad448ee6d9eab202bb58f9a7c9fdfe
parent bf3285cfdb1205b3962bfdc0acc0e99782268795
parent b549ebce63917cefed09752890b037e760a23fd0

Merge "DrmStatus type checks" am: b549ebce63

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

Change-Id: I482d2f2b8f1a18d7ee21aeb225200219bf3efaf6
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;