commit 0842a19fcc13a6faf83447bc66ec25ff111836a5
author Emilian Peev <epeev@google.com> Sat Sep 26 00:14:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 26 00:14:14 2020 +0000
tree 5d72adec0111f2793062dca3c7e0c3895a8df9a4
parent 0235ede24df5351f26eb8a7c7dc6b38f0dc4fed2
parent 3bdbcd525c36357f545a77689e51ec6ef078a2ce

EmulatedCamera: Switch Exif tags make and model source am: 48c7384c4c am: 10c2b9e040 am: 3bdbcd525c

Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/1439216

Change-Id: Ibd21a323729dfeb7c05a08cb4829865919966615

devices/EmulatedCamera/hwl/JpegCompressor.cpp

diff --git a/devices/EmulatedCamera/hwl/JpegCompressor.cpp b/devices/EmulatedCamera/hwl/JpegCompressor.cpp
index 7a512b3..a92b4b0 100644
--- a/devices/EmulatedCamera/hwl/JpegCompressor.cpp
+++ b/devices/EmulatedCamera/hwl/JpegCompressor.cpp
@@ -34,12 +34,12 @@
 JpegCompressor::JpegCompressor() {
   ATRACE_CALL();
   char value[PROPERTY_VALUE_MAX];
-  if (property_get("ro.product.vendor.manufacturer", value, "unknown") <= 0) {
+  if (property_get("ro.product.manufacturer", value, "unknown") <= 0) {
     ALOGW("%s: No Exif make data!", __FUNCTION__);
   }
   exif_make_ = std::string(value);
 
-  if (property_get("ro.product.vendor.model", value, "unknown") <= 0) {
+  if (property_get("ro.product.model", value, "unknown") <= 0) {
     ALOGW("%s: No Exif model data!", __FUNCTION__);
   }
   exif_model_ = std::string(value);