commit b3a16724fec19321b5b758d70c1406269f54b534
author Jeff Tinker <jtinker@google.com> Fri Dec 30 19:03:17 2016 -0800
committer Jeff Tinker <jtinker@google.com> Tue Jan 03 12:33:42 2017 -0800
tree c8f68eaa304be59ee6f1dbfe203f6b362a94b930
parent 02ed4647b7590d0a650cc1d7ab3decbf8fcb9fa4

Changes to drm and crypto HALs as part of client implementation

bug: 32815560
Change-Id: Iced6218014dfc921c94e38db8f7f634ab75b7a75

drm/crypto/1.0/default/CryptoPlugin.cpp

diff --git a/drm/crypto/1.0/default/CryptoPlugin.cpp b/drm/crypto/1.0/default/CryptoPlugin.cpp
index 9173d5b..7921852 100644
--- a/drm/crypto/1.0/default/CryptoPlugin.cpp
+++ b/drm/crypto/1.0/default/CryptoPlugin.cpp
@@ -119,7 +119,7 @@
             bytesWritten = 0;
         }
 
-        _hidl_cb(toStatus(status), bytesWritten, detailMessage.c_str());
+        _hidl_cb(toStatus(status), bytesWritten);
         return Void();
     }
 

drm/crypto/1.0/default/TypeConvert.cpp

diff --git a/drm/crypto/1.0/default/TypeConvert.cpp b/drm/crypto/1.0/default/TypeConvert.cpp
index d9cca6b..ed95d15 100644
--- a/drm/crypto/1.0/default/TypeConvert.cpp
+++ b/drm/crypto/1.0/default/TypeConvert.cpp
@@ -26,6 +26,9 @@
 Status toStatus(status_t legacyStatus) {
     Status status;
     switch(legacyStatus) {
+    case android::OK:
+        status = Status::OK;
+        break;
     case android::ERROR_DRM_NO_LICENSE:
         status = Status::ERROR_DRM_NO_LICENSE;
         break;