Merge "Close CDM sessions only if opened" into pi-dev

2018-05-09 21:59:29 +00:00
parent f29901e310 9c95aba4f5
commit aa183af75b
1 changed files with 9 additions and 7 deletions
--- a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
@@ -142,6 +142,7 @@ WVDrmPlugin::~WVDrmPlugin() {
    }
  }
  mCryptoSessions.clear();
+  if (mCdmIdentifierBuilder.is_sealed()) {
    CdmIdentifier identifier;
    Status status = mCdmIdentifierBuilder.getCdmIdentifier(&identifier);
    if (status != Status::OK) {
@@ -152,6 +153,7 @@ WVDrmPlugin::~WVDrmPlugin() {
        ALOGE("Failed to close cdm. status %d", status);
      }
    }
+  }
 }

 Status WVDrmPlugin::openSessionCommon(std::vector<uint8_t>& sessionId) {