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

@@ -43,7 +43,8 @@ class CryptoSession {
return pre_provision_token_type_;
}
virtual CdmSecurityLevel GetSecurityLevel();
virtual bool GetDeviceUniqueId(std::string* device_id);
virtual bool GetInternalDeviceUniqueId(std::string* device_id);
virtual bool GetExternalDeviceUniqueId(std::string* device_id);
virtual bool GetApiVersion(uint32_t* version);
virtual bool GetSystemId(uint32_t* system_id);
virtual bool GetProvisioningId(std::string* provisioning_id);