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

Commit 29125d4b authored by Kyle Zhang's avatar Kyle Zhang Committed by Gerrit Code Review
Browse files

Merge "Fix getSupportedSchemes() in DrmHal.cpp" into main

parents 344dbf42 5df00bb4

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