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

Snap for 7868516 from 2046fc05fa to tm-release

Browse Source 
Change-Id: Icda9c8c8f218ab0f721223b75a657b08f3e5da02
This commit is contained in:
Android Build Coastguard Worker
2021-10-30 03:19:22 +00:00
parent d3fd510409 2046fc05fa
commit 7acf0f9637
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
View File

@@ -375,9 +375,9 @@ void EngineMetrics::ConsolidateSessions() {
// TODO(b/118664842): Add support to merge older metrics into one // TODO(b/118664842): Add support to merge older metrics into one
// consolidated metric. // consolidated metric.
int excess_completed = completed_session_metrics_list_.size() if (completed_session_metrics_list_.size() > kMaxCompletedSessions) {
- kMaxCompletedSessions; const size_t excess_completed =
if (excess_completed > 0) { completed_session_metrics_list_.size() - kMaxCompletedSessions;
completed_session_metrics_list_.erase( completed_session_metrics_list_.erase(
completed_session_metrics_list_.begin(), completed_session_metrics_list_.begin(),
completed_session_metrics_list_.begin() + excess_completed); completed_session_metrics_list_.begin() + excess_completed);

4
libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp
View File

@@ -56,7 +56,7 @@ bool CreateResponse(uint32_t message_type, const S& core_request,
return false; return false;
} }
uint32_t message_length = ODK_Message_GetSize(&msg); uint32_t message_length = static_cast<uint32_t>(ODK_Message_GetSize(&msg));
msg = ODK_Message_Create(buf.data() + sizeof(header->message_type), msg = ODK_Message_Create(buf.data() + sizeof(header->message_type),
sizeof(header->message_length)); sizeof(header->message_length));
Pack_uint32_t(&msg, &message_length); Pack_uint32_t(&msg, &message_length);
@@ -72,7 +72,7 @@ bool CopyDeviceId(const ODK_ProvisioningRequest& src,
if (request.device_id_length > sizeof(request.device_id)) { if (request.device_id_length > sizeof(request.device_id)) {
return false; return false;
} }
request.device_id_length = device_id.size(); request.device_id_length = static_cast<uint32_t>(device_id.size());
memset(request.device_id, 0, sizeof(request.device_id)); memset(request.device_id, 0, sizeof(request.device_id));
memcpy(request.device_id, device_id.data(), request.device_id_length); memcpy(request.device_id, device_id.data(), request.device_id_length);
return true; return true;

18
libwvdrmengine/oemcrypto/odk/src/serialization_base.c
View File

@@ -52,25 +52,25 @@ void Pack_bool(ODK_Message* message, const bool* value) {
void Pack_uint16_t(ODK_Message* message, const uint16_t* value) { void Pack_uint16_t(ODK_Message* message, const uint16_t* value) {
assert(value); assert(value);
uint8_t data[2] = {0}; uint8_t data[2] = {0};
data[0] = *value >> 8; data[0] = (uint8_t)(*value >> 8);
data[1] = *value >> 0; data[1] = (uint8_t)(*value >> 0);
PackBytes(message, data, sizeof(data)); PackBytes(message, data, sizeof(data));
} }
void Pack_uint32_t(ODK_Message* message, const uint32_t* value) { void Pack_uint32_t(ODK_Message* message, const uint32_t* value) {
assert(value); assert(value);
uint8_t data[4] = {0}; uint8_t data[4] = {0};
data[0] = *value >> 24; data[0] = (uint8_t)(*value >> 24);
data[1] = *value >> 16; data[1] = (uint8_t)(*value >> 16);
data[2] = *value >> 8; data[2] = (uint8_t)(*value >> 8);
data[3] = *value >> 0; data[3] = (uint8_t)(*value >> 0);
PackBytes(message, data, sizeof(data)); PackBytes(message, data, sizeof(data));
} }
void Pack_uint64_t(ODK_Message* message, const uint64_t* value) { void Pack_uint64_t(ODK_Message* message, const uint64_t* value) {
assert(value); assert(value);
uint32_t hi = *value >> 32; uint32_t hi = (uint32_t)(*value >> 32);
uint32_t lo = *value; uint32_t lo = (uint32_t)(*value);
Pack_uint32_t(message, &hi); Pack_uint32_t(message, &hi);
Pack_uint32_t(message, &lo); Pack_uint32_t(message, &lo);
} }
@@ -104,7 +104,7 @@ static void UnpackBytes(ODK_Message* message, uint8_t* ptr, size_t count) {
int Unpack_enum(ODK_Message* message) { int Unpack_enum(ODK_Message* message) {
uint32_t v32; uint32_t v32;
Unpack_uint32_t(message, &v32); Unpack_uint32_t(message, &v32);
return v32; return (int)v32;
} }
void Unpack_bool(ODK_Message* message, bool* value) { void Unpack_bool(ODK_Message* message, bool* value) {