From 8f9f25ca35bee69db7578ff46ea5814d66192b6a Mon Sep 17 00:00:00 2001
From: Jeffrey Kardatzke <jkardatzke@google.com>
Date: Mon, 26 Sep 2022 12:18:02 -0700
Subject: [PATCH] libwvdrmengine: Change ChromeOS ro.product props to ro.vendor

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)
---
 libwvdrmengine/cdm/src/properties_android.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp
index b6a16f5b..4fdc3f2d 100644
--- a/libwvdrmengine/cdm/src/properties_android.cpp
+++ b/libwvdrmengine/cdm/src/properties_android.cpp
@@ -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);