Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae81ba6d authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "DrmStatus type checks" am: b549ebce 

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



Change-Id: I482d2f2b8f1a18d7ee21aeb225200219bf3efaf6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf3285cf b549ebce

drm/libmediadrm/DrmStatus.cpp

+4 −5
Original line number Diff line number Diff line
@@ -27,21 +27,20 @@ DrmStatus::DrmStatus(status_t err, const char *msg) : mStatus(err) { 
        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;