summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-08-04 01:00:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-04 01:00:24 +0000
commit2e529712e67b94aefec81d0e081f9c34c4fef3f7 (patch)
tree0c29df6dbd644aa9b859a09034d8da57aae83e99 /libs
parentba6cdbfdbbbb6f83052e895a698fcc0d71793b25 (diff)
parentc03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e (diff)
downloadframeworks_base-2e529712e67b94aefec81d0e081f9c34c4fef3f7.zip
frameworks_base-2e529712e67b94aefec81d0e081f9c34c4fef3f7.tar.gz
frameworks_base-2e529712e67b94aefec81d0e081f9c34c4fef3f7.tar.bz2
am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e': Disable skipping frames on empty damage
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/renderthread/CanvasContext.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index e472e93..6dfb6e8 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -229,10 +229,11 @@ void CanvasContext::draw() {
SkRect dirty;
mDamageAccumulator.finish(&dirty);
- if (dirty.isEmpty() && Properties::skipEmptyFrames) {
- mCurrentFrameInfo->addFlag(FrameInfoFlags::SkippedFrame);
- return;
- }
+ // TODO: Re-enable after figuring out cause of b/22592975
+// if (dirty.isEmpty() && Properties::skipEmptyFrames) {
+// mCurrentFrameInfo->addFlag(FrameInfoFlags::SkippedFrame);
+// return;
+// }
mCurrentFrameInfo->markIssueDrawCommandsStart();