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

Commit 1431dc2f authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix getKeyRequest legacy HAL returning invalid status" into oc-dev 

am: 140e6a96

Change-Id: Ib51672608147fe181f7d8726e7fcc2525bd6f30a
parents 2f38d2d4 140e6a96

drm/1.0/default/DrmPlugin.cpp

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ namespace implementation { 
            android::DrmPlugin::KeyRequestType legacyRequestType =

                    android::DrmPlugin::kKeyRequestType_Unknown;



            status_t status = mLegacyPlugin->getKeyRequest(toVector(scope),

            status = mLegacyPlugin->getKeyRequest(toVector(scope),

                    toVector(initData), String8(mimeType), legacyKeyType,

                    legacyOptionalParameters, legacyRequest, defaultUrl,

                    &legacyRequestType);
@@ -93,7 +93,7 @@ namespace implementation { 
                requestType = KeyRequestType::RELEASE;

                break;

            case android::DrmPlugin::kKeyRequestType_Unknown:

                status = android::BAD_VALUE;

                requestType = KeyRequestType::UNKNOWN;

                break;

            }

        }