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

Merge "libwvdrmengine: Limit custom property check to ChromeOS"

Browse Source
This commit is contained in:
Jeffrey Kardatzke
2022-09-23 21:26:24 +00:00
committed by Android (Google) Code Review
parent 538313c903 06c1343153
commit ea5825643b
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ const char kL1Dir[] = "/L1/";
const char kL2Dir[] = "/L2/"; const char kL2Dir[] = "/L2/";
const char kL3Dir[] = "/L3/"; const char kL3Dir[] = "/L3/";
const char kFactoryKeyboxPath[] = "/factory/wv.keys"; const char kFactoryKeyboxPath[] = "/factory/wv.keys";
const char kChromeOsHardware[] = "bertha";
bool GetAndroidProperty(const char* key, std::string* value) { bool GetAndroidProperty(const char* key, std::string* value) {
if (!key) { if (!key) {
@@ -63,8 +64,12 @@ bool Properties::GetCompanyName(std::string* company_name) {
LOGW("Properties::GetCompanyName: Invalid parameter"); LOGW("Properties::GetCompanyName: Invalid parameter");
return false; return false;
} }
if (GetAndroidProperty("ro.product.cdm.manufacturer", company_name)) std::string hardware;
if (GetAndroidProperty("ro.hardware", &hardware) &&
hardware == kChromeOsHardware &&
GetAndroidProperty("ro.product.cdm.manufacturer", company_name)) {
return true; return true;
}
return GetAndroidProperty("ro.product.manufacturer", company_name); return GetAndroidProperty("ro.product.manufacturer", company_name);
} }
@@ -73,7 +78,12 @@ bool Properties::GetModelName(std::string* model_name) {
LOGW("Properties::GetModelName: Invalid parameter"); LOGW("Properties::GetModelName: Invalid parameter");
return false; return false;
} }
if (GetAndroidProperty("ro.product.cdm.model", model_name)) return true; std::string hardware;
if (GetAndroidProperty("ro.hardware", &hardware) &&
hardware == kChromeOsHardware &&
GetAndroidProperty("ro.product.cdm.model", model_name)) {
return true;
}
return GetAndroidProperty("ro.product.model", model_name); return GetAndroidProperty("ro.product.model", model_name);
} }
@@ -94,7 +104,12 @@ bool Properties::GetDeviceName(std::string* device_name) {
LOGW("Properties::GetDeviceName: Invalid parameter"); LOGW("Properties::GetDeviceName: Invalid parameter");
return false; return false;
} }
if (GetAndroidProperty("ro.product.cdm.device", device_name)) return true; std::string hardware;
if (GetAndroidProperty("ro.hardware", &hardware) &&
hardware == kChromeOsHardware &&
GetAndroidProperty("ro.product.cdm.device", device_name)) {
return true;
}
return GetAndroidProperty("ro.product.device", device_name); return GetAndroidProperty("ro.product.device", device_name);
} }