From 8764c60fd4b3b3a434b4fe0186f03d840c556713 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Fri, 4 Nov 2022 11:33:05 -0700 Subject: [PATCH] Add "version" to device info in prov4 upload tool [ Merge of http://go/wvgerrit/160457 ] Bug: 255921326 Test: WV android unit tests Merged from https://widevine-internal-review.googlesource.com/160427 Change-Id: I3e2b7158c72fb4321b67053995f62483da934a18 --- libwvdrmengine/factory_upload_tool/src/WidevineProvisioner.cpp | 1 + .../tools/factory_upload_tool/src/WidevineProvisioner.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/libwvdrmengine/factory_upload_tool/src/WidevineProvisioner.cpp b/libwvdrmengine/factory_upload_tool/src/WidevineProvisioner.cpp index 5ae48ec3..82e7c4c5 100644 --- a/libwvdrmengine/factory_upload_tool/src/WidevineProvisioner.cpp +++ b/libwvdrmengine/factory_upload_tool/src/WidevineProvisioner.cpp @@ -64,6 +64,7 @@ bool WidevineProvisioner::GenerateCertificateRequest( bool WidevineProvisioner::GetDeviceInfo(std::vector& device_info) { auto device_info_map = cppbor::Map(); device_info_map.add(cppbor::Tstr("type"), cppbor::Tstr("widevine")); + device_info_map.add(cppbor::Tstr("version"), cppbor::Uint(2)); std::string company_name; if (!wvcdm::Properties::GetCompanyName(&company_name) || diff --git a/libwvdrmengine/tools/factory_upload_tool/src/WidevineProvisioner.cpp b/libwvdrmengine/tools/factory_upload_tool/src/WidevineProvisioner.cpp index af187104..c5c8515d 100644 --- a/libwvdrmengine/tools/factory_upload_tool/src/WidevineProvisioner.cpp +++ b/libwvdrmengine/tools/factory_upload_tool/src/WidevineProvisioner.cpp @@ -73,6 +73,7 @@ bool WidevineProvisioner::GenerateCertificateRequest( bool WidevineProvisioner::GetDeviceInfo(std::vector& device_info) { auto device_info_map = cppbor::Map(); device_info_map.add(cppbor::Tstr("type"), cppbor::Tstr("widevine")); + device_info_map.add(cppbor::Tstr("version"), cppbor::Uint(2)); std::string company_name; if (!wvcdm::Properties::GetCompanyName(&company_name) ||