commit 771b0d75bd31058f5faa9a9ec7070a434e995f0d
author Chong Zhang <chz@google.com> Wed Aug 30 23:54:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 30 23:54:45 2017 +0000
tree 7bc681e22e55e9cfe50529118283a52c5b42218f
parent 4cf8cc03483e69dd17a65c1bddc13c43af939bbc
parent e1333de6477349b650fe966590ea74b17401c329

Merge "cas: fix missing error code conversion" into oc-mr1-dev
am: e1333de647

Change-Id: I4767afc50305e53deb2c76c229eb25aca039a698

cas/1.0/default/TypeConvert.cpp

diff --git a/cas/1.0/default/TypeConvert.cpp b/cas/1.0/default/TypeConvert.cpp
index de1f92b..cd0efdb 100644
--- a/cas/1.0/default/TypeConvert.cpp
+++ b/cas/1.0/default/TypeConvert.cpp
@@ -62,6 +62,9 @@
     case android::ERROR_CAS_DEVICE_REVOKED:
         status = Status::ERROR_CAS_DEVICE_REVOKED;
         break;
+    case android::ERROR_CAS_DECRYPT_UNIT_NOT_INITIALIZED:
+        status = Status::ERROR_CAS_DECRYPT_UNIT_NOT_INITIALIZED;
+        break;
     case android::ERROR_CAS_DECRYPT:
         status = Status::ERROR_CAS_DECRYPT;
         break;