summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2016-08-02 20:36:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-02 20:36:20 +0000
commita3c35852a16b368164fcc2c7b679ef9dcb4d62d3 (patch)
treeb4464ba74899ada463c32f375acbfa258ac4a370 /libs
parentf77b6620d14a84d7112e3ab014c65f26a1b24787 (diff)
parentb51b2864e8ee58cad1b1880a3424112587a6e9e9 (diff)
downloadandroid-frameworks-base-a3c35852a16b368164fcc2c7b679ef9dcb4d62d3.tar.gz
android-frameworks-base-a3c35852a16b368164fcc2c7b679ef9dcb4d62d3.tar.xz
Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/RenderNode.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 6facf20..bdcad79 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -422,7 +422,6 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) {
pushStagingDisplayListChanges(info);
}
prepareSubTree(info, childFunctorsNeedLayer, mDisplayList);
- pushLayerUpdate(info);
if (mDisplayList) {
for (auto& vectorDrawable : mDisplayList->getVectorDrawables()) {
@@ -433,6 +432,7 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) {
vectorDrawable->setPropertyChangeWillBeConsumed(true);
}
}
+ pushLayerUpdate(info);
info.damageAccumulator->popTransform();
}