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

libwvdrmengine: Change ChromeOS ro.product props to ro.vendor

Browse Source 
As of Android T, these need to start with the ro.vendor prefix. We are
doing it now so we can update ChromeOS to be in sync for either version.

Bug: 237492145, 248584954
Test: No properties errors in logcat during playback
Change-Id: Ic6fac64e621be65385d16808dbef52914a66967a
(cherry picked from commit 28a040d407b28d24dd4d5496dd08cfa2f6579d71)
(cherry picked from commit a932781fcc7d2d89d73c546bf244399daf02f5ac)
This commit is contained in:
Jeffrey Kardatzke
2022-09-26 12:18:02 -07:00
parent 56ee5f052c
commit 8f9f25ca35
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/src/properties_android.cpp
View File

@@ -67,7 +67,7 @@ bool Properties::GetCompanyName(std::string* company_name) {
std::string hardware;
if (GetAndroidProperty("ro.hardware", &hardware) &&
hardware == kChromeOsHardware &&
GetAndroidProperty("ro.product.cdm.manufacturer", company_name)) {
GetAndroidProperty("ro.vendor.cdm.manufacturer", company_name)) {
return true;
}
return GetAndroidProperty("ro.product.manufacturer", company_name);
@@ -81,7 +81,7 @@ bool Properties::GetModelName(std::string* model_name) {
std::string hardware;
if (GetAndroidProperty("ro.hardware", &hardware) &&
hardware == kChromeOsHardware &&
GetAndroidProperty("ro.product.cdm.model", model_name)) {
GetAndroidProperty("ro.vendor.cdm.model", model_name)) {
return true;
}
return GetAndroidProperty("ro.product.model", model_name);
@@ -107,7 +107,7 @@ bool Properties::GetDeviceName(std::string* device_name) {
std::string hardware;
if (GetAndroidProperty("ro.hardware", &hardware) &&
hardware == kChromeOsHardware &&
GetAndroidProperty("ro.product.cdm.device", device_name)) {
GetAndroidProperty("ro.vendor.cdm.device", device_name)) {
return true;
}
return GetAndroidProperty("ro.product.device", device_name);