commit fea340f1fe0fc0182c99e128ef284c4629c7427d
author Jeff Tinker <jtinker@google.com> Mon Mar 06 16:58:47 2017 -0800
committer Jeff Tinker <jtinker@google.com> Thu Mar 30 16:00:12 2017 -0700
tree c367d2c0b3d92f1b57c3b9d5fca612199d8cd54c
parent 8074912d8c3ceb38bc432c9837c7555162e93ead

Fix getKeyRequest legacy HAL returning invalid status

bug: 36006198

Test: drm hal vts test
Change-Id: Ie3125b4459add4fd30dc418f92ab0f51d8fcc73b

drm/1.0/default/DrmPlugin.cpp

diff --git a/drm/1.0/default/DrmPlugin.cpp b/drm/1.0/default/DrmPlugin.cpp
index 6f51e0e..c7428a5 100644
--- a/drm/1.0/default/DrmPlugin.cpp
+++ b/drm/1.0/default/DrmPlugin.cpp
@@ -77,7 +77,7 @@
             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 @@
                 requestType = KeyRequestType::RELEASE;
                 break;
             case android::DrmPlugin::kKeyRequestType_Unknown:
-                status = android::BAD_VALUE;
+                requestType = KeyRequestType::UNKNOWN;
                 break;
             }
         }