From 6c35b9e67ae5ded10c4cd16378c87e3fd3e58ac9 Mon Sep 17 00:00:00 2001 From: Alex Dale Date: Fri, 17 Jun 2022 19:57:43 -0700 Subject: [PATCH] Clang-formatted properties_android.cpp with new CDM properties. The CL http://ag/16988980 introduced new Adnroid property queries to the CDM; however, the file was not of the correct format for the CDM repo. This CL simply ran clang-format on the file. Bug: 197771575 Bug: 236317198 Test: none Change-Id: I5293864f84d1297efb7aef2a96a71794217c5203 --- libwvdrmengine/cdm/src/properties_android.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp index 458b71b1..f3383566 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -70,8 +70,7 @@ bool Properties::GetModelName(std::string* model_name) { LOGW("Properties::GetModelName: Invalid parameter"); return false; } - if (GetAndroidProperty("ro.product.cdm.model", model_name)) - return true; + if (GetAndroidProperty("ro.product.cdm.model", model_name)) return true; return GetAndroidProperty("ro.product.model", model_name); } @@ -92,8 +91,7 @@ bool Properties::GetDeviceName(std::string* device_name) { LOGW("Properties::GetDeviceName: Invalid parameter"); return false; } - if (GetAndroidProperty("ro.product.cdm.device", device_name)) - return true; + if (GetAndroidProperty("ro.product.cdm.device", device_name)) return true; return GetAndroidProperty("ro.product.device", device_name); }