From fea340f1fe0fc0182c99e128ef284c4629c7427d Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Mon, 6 Mar 2017 16:58:47 -0800 Subject: [PATCH] Fix getKeyRequest legacy HAL returning invalid status bug: 36006198 Test: drm hal vts test Change-Id: Ie3125b4459add4fd30dc418f92ab0f51d8fcc73b --- drm/1.0/default/DrmPlugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drm/1.0/default/DrmPlugin.cpp b/drm/1.0/default/DrmPlugin.cpp index 6f51e0e9..c7428a5c 100644 --- a/drm/1.0/default/DrmPlugin.cpp +++ b/drm/1.0/default/DrmPlugin.cpp @@ -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; } } -- 2.11.0