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

Commit 6205a06d authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Fix abort due to missing hidl status check am: e641294b 

am: 3d2206df

Change-Id: I9a4e4b7c6bf5d61056190be066002888b7659f24
parents f8934de1 3d2206df

drm/libmediadrm/DrmHal.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1186,9 +1186,9 @@ status_t DrmHal::setCipherAlgorithm(Vector<uint8_t> const &sessionId, 


    DrmSessionManager::Instance()->useSession(sessionId);



    Status status = mPlugin->setCipherAlgorithm(toHidlVec(sessionId),

    Return<Status> status = mPlugin->setCipherAlgorithm(toHidlVec(sessionId),

            toHidlString(algorithm));

    return toStatusT(status);

    return status.isOk() ? toStatusT(status) : DEAD_OBJECT;

}



status_t DrmHal::setMacAlgorithm(Vector<uint8_t> const &sessionId,
@@ -1198,9 +1198,9 @@ status_t DrmHal::setMacAlgorithm(Vector<uint8_t> const &sessionId, 


    DrmSessionManager::Instance()->useSession(sessionId);



    Status status = mPlugin->setMacAlgorithm(toHidlVec(sessionId),

    Return<Status> status = mPlugin->setMacAlgorithm(toHidlVec(sessionId),

            toHidlString(algorithm));

    return toStatusT(status);

    return status.isOk() ? toStatusT(status) : DEAD_OBJECT;

}



status_t DrmHal::encrypt(Vector<uint8_t> const &sessionId,