commit 8c02341c732956b282f11744501cc6a97ac165dc
author Fabien Sanglard <sanglardf@google.com> Fri Mar 17 03:36:58 2017 +0000
committer Fabien Sanglard <sanglardf@google.com> Fri Mar 17 03:36:58 2017 +0000
tree 4f3bd0c66f8541d217b54bde66468507481436dd
parent 56a5dbd3b050cbfd324308d224c7d12f4aec3320

Revert "Use configStore for maxVirtualDisplay Size"

This reverts commit 56a5dbd3b050cbfd324308d224c7d12f4aec3320.

Change-Id: I66224bb48d3146846200ff7f2d5a66d1d8ff5cf7

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
index 04ef57c..6f6c08b 100644
--- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
+++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
@@ -114,7 +114,6 @@
 bool SurfaceFlinger::useContextPriority;
 int64_t SurfaceFlinger::dispSyncPresentTimeOffset;
 bool SurfaceFlinger::useHwcForRgbToYuv;
-uint64_t SurfaceFlinger::maxVirtualDisplaySize;
 
 SurfaceFlinger::SurfaceFlinger()
     :   BnSurfaceComposer(),
@@ -151,17 +150,13 @@
         mLastSwapTime(0),
         mNumLayers(0)
 {
-
-    ALOGI("SurfaceFlinger is starting");
-
     vsyncPhaseOffsetNs = getInt64< ISurfaceFlingerConfigs,
             &ISurfaceFlingerConfigs::vsyncEventPhaseOffsetNs>(1000000);
 
     sfVsyncPhaseOffsetNs = getInt64< ISurfaceFlingerConfigs,
             &ISurfaceFlingerConfigs::vsyncSfEventPhaseOffsetNs>(1000000);
 
-    maxVirtualDisplaySize = getUInt64<ISurfaceFlingerConfigs,
-            &ISurfaceFlingerConfigs::maxVirtualDisplaySize>(0);
+    ALOGI("SurfaceFlinger is starting");
 
     useContextPriority = getBool< ISurfaceFlingerConfigs,
             &ISurfaceFlingerConfigs::useContextPriority>(false);
@@ -1706,9 +1701,9 @@
                             ALOGE_IF(status != NO_ERROR,
                                     "Unable to query height (%d)", status);
                             if (mUseHwcVirtualDisplays &&
-                                    (SurfaceFlinger::maxVirtualDisplaySize == 0 ||
-                                    (width <= SurfaceFlinger::maxVirtualDisplaySize &&
-                                     height <= SurfaceFlinger::maxVirtualDisplaySize))) {
+                                    (MAX_VIRTUAL_DISPLAY_DIMENSION == 0 ||
+                                    (width <= MAX_VIRTUAL_DISPLAY_DIMENSION &&
+                                     height <= MAX_VIRTUAL_DISPLAY_DIMENSION))) {
                                 hwcDisplayId = allocateHwcDisplayId(state.type);
                             }
 
@@ -3020,7 +3015,6 @@
 
     result.appendFormat(" PRESENT_TIME_OFFSET=%" PRId64, dispSyncPresentTimeOffset);
     result.appendFormat(" FORCE_HWC_FOR_RBG_TO_YUV=%d", useHwcForRgbToYuv);
-    result.appendFormat(" MAX_VIRT_DISPLAY_DIM=%" PRIu64, maxVirtualDisplaySize);
     result.append("]");
 }