From 763238b5970ff70e854dac41414fd2b2e946e95c Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Thu, 12 Jan 2017 21:55:35 -0800 Subject: [PATCH] Use "individualization-request" to provision devices. [ Merge of http://go/wvgerrit/18290 ] Now uses the "individualization-request" message type to provision the device, instead of using global provisioning. This also allows per-origin provisioning and storage in CE. b/27170580 Test: All unittests other than some oemcrypto, request_license_test passed. Those tests failed with or without this CL. Change-Id: I6fc39d7ccc3952e7269426d6d95767f53b787d54 --- libwvdrmengine/cdm/core/src/cdm_engine.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp index 7b13434b..fbd1afdd 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp @@ -127,6 +127,9 @@ CdmResponseType CdmEngine::OpenSession(const CdmKeySystem& key_system, if (sts == NEED_PROVISIONING) { cert_provisioning_requested_security_level_ = new_session->GetRequestedSecurityLevel(); + // Reserve a session ID so the CDM can return success. + if (session_id) + *session_id = new_session->GenerateSessionId(); } else { LOGE("CdmEngine::OpenSession: bad session init: %d", sts); }