From 4e201c2700c39b09863884cf61d855b547782a81 Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Sat, 31 Mar 2018 03:37:36 -0700
Subject: [PATCH] Correct segfault in
 WvCdmRequestLicenseTest.UsageRemoveSecureStopTest

[ Merge of http://go/wvgerrit/46622 ]

Secure stop API related changes introduced in b/69674645 caused
segfaults on taimen/walleye but not other devices due to a difference
in OEMCrypto version.

Bug: 77294890
Test: WV unit/integration tests on sailfish and walleye
Change-Id: I8523ef283334d7d32d180e902072fe1dd6e665c1
---
 libwvdrmengine/cdm/core/src/cdm_engine.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index d849da28..5929e6d4 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -1315,8 +1315,7 @@ CdmResponseType CdmEngine::RemoveUsageInfo(
 
       switch (usage_session_->get_usage_support_type()) {
         case kUsageEntrySupport: {
-          status = usage_session_->DeleteUsageEntry(
-              usage_data[0].usage_entry_number);
+          status = usage_session_->DeleteUsageEntry(usage_entry_number);
 
           if (!handle.DeleteUsageInfo(
                 DeviceFiles::GetUsageInfoFileName(app_id),