commit 3229455a740fc2191e3b9bbe8d8deaa2fbfc68d0
author Chong Zhang <chz@google.com> Thu Aug 31 00:02:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 31 00:02:36 2017 +0000
tree c0406d81d0173baa14d436b0263bf3772fa17fed
parent 211b44792ecfbff1838eeee91bca6f42130d0dc7
parent 771b0d75bd31058f5faa9a9ec7070a434e995f0d

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

Change-Id: I9f270161dc3057a185427d6e63368c1b9bbe4ac4

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;