am a2eeb8ab: Native fault in MediaDrm property call

* commit 'a2eeb8abf7ce9ee633ec72e4086ff103a57848d6':
  Native fault in MediaDrm property call

libwvdrmengine/cdm/core/src/crypto_engine.cpp

@@ -179,6 +179,9 @@ bool CryptoEngine::GetToken(std::string* token) {
 }
 
 CryptoEngine::SecurityLevel CryptoEngine::GetSecurityLevel() {
+  if (!Init())
+    return kSecurityLevelUnknown;
+
   std::string security_level = OEMCrypto_SecurityLevel();
 
   if ((security_level.size() != 2) ||
@@ -197,6 +200,9 @@ CryptoEngine::SecurityLevel CryptoEngine::GetSecurityLevel() {
 }
 
 bool CryptoEngine::GetDeviceUniqueId(std::string* deviceId) {
+  if (!Init())
+    return false;
+
   std::vector<uint8_t> id;
   size_t idLength = 32;
 
@@ -213,6 +219,9 @@ bool CryptoEngine::GetDeviceUniqueId(std::string* deviceId) {
 }
 
 bool CryptoEngine::GetSystemId(uint32_t* systemId) {
+  if (!Init())
+    return false;
+
   uint8_t buf[72];
   size_t buflen = 72;
 

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -200,10 +200,6 @@ TEST_F(WvCdmRequestLicenseTest, QueryKeyStatus) {
 }
 
 TEST_F(WvCdmRequestLicenseTest, QueryStatus) {
-  decryptor_.OpenSession(g_key_system, &session_id_);
-  GenerateKeyRequest(g_key_system, g_key_id);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, false);
-
   CdmQueryMap query_info;
   CdmQueryMap::iterator itr;
   EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.QueryStatus(&query_info));