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

Merge "Clang-formatted properties_android.cpp with new CDM properties."

Browse Source
This commit is contained in:
Alex Dale
2022-06-21 20:54:44 +00:00
committed by Android (Google) Code Review
parent 9b04109b60 6c35b9e67a
commit 4fbc410346
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,8 +70,7 @@ 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)) if (GetAndroidProperty("ro.product.cdm.model", model_name)) return true;
return true;
return GetAndroidProperty("ro.product.model", model_name); return GetAndroidProperty("ro.product.model", model_name);
} }
@@ -92,8 +91,7 @@ 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)) if (GetAndroidProperty("ro.product.cdm.device", device_name)) return true;
return true;
return GetAndroidProperty("ro.product.device", device_name); return GetAndroidProperty("ro.product.device", device_name);
} }