commit 68cd9a8e2a09b858ff0e5272e33967e21daf59f1
author Kevin Schoedel <kpschoedel@google.com> Fri Jun 23 20:53:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 20:53:10 2017 +0000
tree 6e1c9ad25fe23a63cdf6bff0784b6f272246e088
parent c8c8a6170b8ddfb41c29b48b39ca4a3d5cf4f417
parent c0df4a029b0995503fed4d828ff5d62345a23aab

Merge "Make VR HWC DPI a configurable property" into oc-dr1-dev am: 281a0c26c0
am: c0df4a029b

Change-Id: Ib1c6fabbb4962b0e8895b6252de63713311ad1d4

services/vr/hardware_composer/impl/vr_hwc.cpp

diff --git a/services/vr/hardware_composer/impl/vr_hwc.cpp b/services/vr/hardware_composer/impl/vr_hwc.cpp
index 9bbb7f3..861114d 100644
--- a/services/vr/hardware_composer/impl/vr_hwc.cpp
+++ b/services/vr/hardware_composer/impl/vr_hwc.cpp
@@ -15,6 +15,7 @@
  */
 #include "impl/vr_hwc.h"
 
+#include <cutils/properties.h>
 #include <private/dvr/display_client.h>
 #include <ui/Fence.h>
 
@@ -352,7 +353,14 @@
       break;
     case IComposerClient::Attribute::DPI_X:
     case IComposerClient::Attribute::DPI_Y:
-      *outValue = 300 * 1000;  // 300dpi
+      {
+        constexpr int32_t kDefaultDPI = 300;
+        int32_t dpi = property_get_int32("ro.vr.hwc.dpi", kDefaultDPI);
+        if (dpi <= 0) {
+          dpi = kDefaultDPI;
+        }
+        *outValue = 1000 * dpi;
+      }
       break;
     default:
       return Error::BAD_PARAMETER;