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

Commit 6441ec89 authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix getSupportedSchemes() in DrmHal.cpp" into main am: 29125d4b am: 798533e9 

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



Change-Id: Id81d19ab567d560f6ca09b9a1039c3afa62bc518
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47b5c5e6 798533e9

drm/libmediadrm/DrmHal.cpp

+4 −4
Original line number Diff line number Diff line
@@ -288,10 +288,10 @@ DrmStatus DrmHal::getLogMessages(Vector<drm::V1_4::LogMessage>& logs) const { 
}



DrmStatus DrmHal::getSupportedSchemes(std::vector<uint8_t>& schemes) const {

    status_t statusResult;

    statusResult = mDrmHalAidl->getSupportedSchemes(schemes);

    if (statusResult == OK) return statusResult;

    return mDrmHalHidl->getSupportedSchemes(schemes);

    const DrmStatus statusResultAidl = mDrmHalAidl->getSupportedSchemes(schemes);

    const DrmStatus statusResultHidl = mDrmHalHidl->getSupportedSchemes(schemes);

    if (statusResultHidl == OK || statusResultAidl == OK) return OK;

    return statusResultAidl;

}



}  // namespace android