Snap for 6761965 from 17e0562098 to sc-release

Change-Id: Id504c8739ad83d44e7dd16ddecf48b7fbea970ff

libwvdrmengine/cdm/core/src/crypto_session.cpp

@@ -852,7 +852,22 @@ void CryptoSession::Close() {
   WithOecWriteLock(
       "Close", [&] { close_sts = OEMCrypto_CloseSession(oec_session_id_); });
   metrics_->oemcrypto_close_session_.Increment(close_sts);
-  if (OEMCrypto_SUCCESS == close_sts) open_ = false;
+
+  if (close_sts != OEMCrypto_SUCCESS) {
+    LOGW("OEMCrypto_CloseSession failed: status = %d",
+         static_cast<int>(close_sts));
+  }
+  switch (close_sts) {
+    case OEMCrypto_SUCCESS:
+    case OEMCrypto_ERROR_INVALID_SESSION:
+    case OEMCrypto_ERROR_SYSTEM_INVALIDATED:
+      open_ = false;
+      break;
+    case OEMCrypto_ERROR_CLOSE_SESSION_FAILED:
+    default:
+      // empty case
+      break;
+  }
 }
 
 CdmResponseType CryptoSession::PrepareAndSignLicenseRequest(