From: Jaesoo Lee <jaesoo@google.com>
Date: Thu, 16 Feb 2017 05:27:03 +0000 (+0000)
Subject: Merge changes from topic 'cfg_nsfbuf'
X-Git-Tag: android-x86-8.1-r1~657
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=125c3ae33e284b09dede27a7e01b0b51d0653227;p=android-x86%2Fframeworks-native.git

Merge changes from topic 'cfg_nsfbuf'

* changes:
  configstore: removing BoardConfig variables (NUM_FRAMEBUFFER_SURFACE_BUFFERS)
  configstore: use utility functions defined in ConfigStoreUtils.h
---

125c3ae33e284b09dede27a7e01b0b51d0653227
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
index d2dddba27d,b39692c587..c21c81676b
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@@ -136,10 -124,12 +124,12 @@@ using namespace android::hardware::conf
  // the latency will end up being an additional vsync period, and animations
  // will hiccup.  Therefore, this latency should be tuned somewhat
  // conservatively (or at least with awareness of the trade-off being made).
- static int64_t vsyncPhaseOffsetNs = getVsyncEventPhaseOffsetNs();
+ static int64_t vsyncPhaseOffsetNs = getInt64<
+         ISurfaceFlingerConfigs,
+         &ISurfaceFlingerConfigs::vsyncEventPhaseOffsetNs>(1000000);
  
  // This is the phase offset at which SurfaceFlinger's composition runs.
 -static const int64_t sfVsyncPhaseOffsetNs = SF_VSYNC_EVENT_PHASE_OFFSET_NS;
 +static constexpr int64_t sfVsyncPhaseOffsetNs = SF_VSYNC_EVENT_PHASE_OFFSET_NS;
  
  // ---------------------------------------------------------------------------