Respect Client Properties when reporting CDM Status

[ Merge from go/wvgerrit/14286 ]

CDM now reports status information associated with the specified security level.
Earlier information would be reported from the default security level.

b/18709693

Change-Id: I7a01e8ea9773b56951c207437ce85e567fd32b09

libwvdrmengine/include/WVErrors.h

@@ -160,7 +160,8 @@ enum {
   kClientIdAesEncryptError = ERROR_DRM_VENDOR_MIN + 144,
   kClientIdRsaInitError = ERROR_DRM_VENDOR_MIN + 145,
   kClientIdRsaEncryptError = ERROR_DRM_VENDOR_MIN + 146,
-  kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 146,
+  kInvalidQueryStatus = ERROR_DRM_VENDOR_MIN + 147,
+  kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 147,
 
   // Used by crypto test mode
   kErrorTestMode = ERROR_DRM_VENDOR_MAX,

libwvdrmengine/include/mapErrors-inl.h

@@ -309,6 +309,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
       // KEY_ERROR is used by the CDM to mean just about any kind of error, not
       // just license errors, so it is mapped to the generic response.
       return kErrorCDMGeneric;
+    case wvcdm::INVALID_QUERY_STATUS:
+      return kInvalidQueryStatus;
     case wvcdm::UNKNOWN_ERROR:
       return android::ERROR_DRM_UNKNOWN;
   }