commit 22504ba0c65faa2769d34df6b93e96a7a62e6559
author Linux Build Service Account <lnxbuild@localhost> Fri Jun 05 11:31:42 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 05 11:31:42 2015 -0700
tree 796f7ebe136b868bd0898c4bfed3212afc884793
parent 96fdca79648c1335926f4ade326cd6064a5549d1
parent 1c5431e111e48be8cfc07c8d64ce2ee58c3bc123

Merge "hwc: Reset the refresh rate alone to avoid stack corruption."

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 43a7a1a..8c8eb35 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -2181,7 +2181,8 @@
                 __FUNCTION__);
         mCachedFrame.reset();
 #ifdef DYNAMIC_FPS
-        setDynRefreshRate(ctx, list);
+        // Reset refresh rate
+        setRefreshRate(ctx, mDpy, ctx->dpyAttr[mDpy].refreshRate);
 #endif
         freeHwCursor(ctx->dpyAttr[mDpy].fd, mDpy);
         return -1;
@@ -2198,7 +2199,8 @@
         setMDPCompLayerFlags(ctx, list);
         mCachedFrame.updateCounts(mCurrentFrame);
 #ifdef DYNAMIC_FPS
-        setDynRefreshRate(ctx, list);
+        // Reset refresh rate
+        setRefreshRate(ctx, mDpy, ctx->dpyAttr[mDpy].refreshRate);
 #endif
         freeHwCursor(ctx->dpyAttr[mDpy].fd, mDpy);
         ret = -1;