diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-02-11 19:48:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-11 19:48:18 +0000 |
| commit | 351c2941736039c495dd7ac849ec64fbf7f3ff05 (patch) | |
| tree | 7ecf82baf37c3c85ec1137d6b9605bc074c305dc /services/surfaceflinger/Layer.cpp | |
| parent | b7c1ebc3fbf36c51fac1ee0437263b0f2698208b (diff) | |
| parent | 4b0eba949cc026ffb2c75313042d8a7bcb3fcf86 (diff) | |
| download | frameworks_native-351c2941736039c495dd7ac849ec64fbf7f3ff05.zip frameworks_native-351c2941736039c495dd7ac849ec64fbf7f3ff05.tar.gz frameworks_native-351c2941736039c495dd7ac849ec64fbf7f3ff05.tar.bz2 | |
Merge changes I8bded1ea,I7478293e
* changes:
SurfaceFlinger: add win anim frame time tracking
SurfaceFlinger: remove a driver bug workaround
Diffstat (limited to 'services/surfaceflinger/Layer.cpp')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 95a5e02..99af857 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -536,9 +536,6 @@ void Layer::onPostComposition() { const HWComposer& hwc = mFlinger->getHwComposer(); sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY); - // XXX: Temporarily don't use the present fence from HWC to work - // around a driver bug. - presentFence.clear(); if (presentFence != NULL) { mFrameTracker.setActualPresentFence(presentFence); } else { @@ -757,9 +754,6 @@ void Layer::dump(String8& result, char* buffer, size_t SIZE) const void Layer::dumpStats(String8& result, char* buffer, size_t SIZE) const { LayerBaseClient::dumpStats(result, buffer, SIZE); - const nsecs_t period = - mFlinger->getHwComposer().getRefreshPeriod(HWC_DISPLAY_PRIMARY); - result.appendFormat("%lld\n", period); mFrameTracker.dump(result); } |