widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save usage information before closing a session am: 9ba6493e1b

Browse Source 
am: 86a1b18c24

Change-Id: I021e8792da5051f3a7cde08a7af33409e2c81194
This commit is contained in:
Rahul Frias
2018-04-26 17:13:03 -07:00
committed by android-build-merger
parent 86c93da973 86a1b18c24
commit 668f387ff6
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -54,6 +54,12 @@ CdmSession::CdmSession(FileSystem* file_system,
} }
CdmSession::~CdmSession() { CdmSession::~CdmSession() {
if (usage_support_type_ == kUsageEntrySupport &&
has_provider_session_token() &&
usage_table_header_ != NULL) {
UpdateUsageEntryInformation();
}
if (!key_set_id_.empty()) { if (!key_set_id_.empty()) {
// Unreserve the license ID. // Unreserve the license ID.
file_handle_->UnreserveLicenseId(key_set_id_); file_handle_->UnreserveLicenseId(key_set_id_);

7
libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
View File

@@ -338,11 +338,12 @@ TEST_F(CdmSessionTest, UpdateUsageEntry) {
// Set up mocks and expectations for the UpdateUsageEntryInformation call. // Set up mocks and expectations for the UpdateUsageEntryInformation call.
EXPECT_CALL(*crypto_session_, GetUsageSupportType(_)) EXPECT_CALL(*crypto_session_, GetUsageSupportType(_))
.WillOnce(DoAll(SetArgPointee<0>(kUsageEntrySupport), Return(NO_ERROR))); .WillRepeatedly(DoAll(
SetArgPointee<0>(kUsageEntrySupport), Return(NO_ERROR)));
EXPECT_CALL(*license_parser_, provider_session_token()) EXPECT_CALL(*license_parser_, provider_session_token())
.WillOnce(Return("Mock provider session token")); .WillRepeatedly(Return("Mock provider session token"));
EXPECT_CALL(usage_table_header_, UpdateEntry(NotNull(), NotNull())) EXPECT_CALL(usage_table_header_, UpdateEntry(NotNull(), NotNull()))
.WillOnce(Return(NO_ERROR)); .WillRepeatedly(Return(NO_ERROR));
EXPECT_EQ(NO_ERROR, cdm_session_->Init(NULL)); EXPECT_EQ(NO_ERROR, cdm_session_->Init(NULL));
EXPECT_EQ(kUsageEntrySupport, cdm_session_->get_usage_support_type()) EXPECT_EQ(kUsageEntrySupport, cdm_session_->get_usage_support_type())