Merge "Query Usage Table Size bug"

This commit is contained in:
Rahul Frias
2020-02-14 17:51:17 +00:00
committed by Android (Google) Code Review

View File

@@ -694,7 +694,6 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
LOGW("GetProvisioningMethod returns invalid token type: %d", LOGW("GetProvisioningMethod returns invalid token type: %d",
static_cast<int>(token_type)); static_cast<int>(token_type));
return GET_PROVISIONING_METHOD_ERROR; return GET_PROVISIONING_METHOD_ERROR;
break;
} }
return NO_ERROR; return NO_ERROR;
} else if (query_token == QUERY_KEY_MAX_USAGE_TABLE_ENTRIES) { } else if (query_token == QUERY_KEY_MAX_USAGE_TABLE_ENTRIES) {
@@ -705,6 +704,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
*query_response = std::to_string(max_number_of_usage_entries); *query_response = std::to_string(max_number_of_usage_entries);
return NO_ERROR;
} else if (query_token == QUERY_KEY_OEMCRYPTO_API_MINOR_VERSION) { } else if (query_token == QUERY_KEY_OEMCRYPTO_API_MINOR_VERSION) {
uint32_t api_minor_version; uint32_t api_minor_version;
if (!crypto_session->GetApiMinorVersion(security_level, if (!crypto_session->GetApiMinorVersion(security_level,