Merge changes Ib82cf7a1,Ice6a8eab into oc-dev

* changes:
  Hash OEM Certificate
  Maxing Out Sessions Can Cause SPOID Failures
This commit is contained in:
John Bruce
2017-04-20 17:21:46 +00:00
committed by Android (Google) Code Review
8 changed files with 136 additions and 170 deletions

View File

@@ -546,7 +546,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
std::string deviceId;
bool got_id;
M_TIME(
got_id = crypto_session.GetDeviceUniqueId(
got_id = crypto_session.GetExternalDeviceUniqueId(
&deviceId),
&metrics_,
crypto_session_get_device_unique_id_,