Merge "Improve snapshot clearing consistency" into sc-dev am: 2b9301d01f am: e4f1c29683

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15018151

Change-Id: I7bb3acf7946841b3d9948501209fdf5c160597fc

libs/hwui/RenderNode.cpp

@@ -455,8 +455,7 @@ void RenderNode::destroyLayers() {
     if (hasLayer()) {
         this->setLayerSurface(nullptr);
     }
-    mSnapshotResult.snapshot = nullptr;
-    mTargetImageFilter = nullptr;
+
     if (mDisplayList) {
         mDisplayList.updateChildren([](RenderNode* child) { child->destroyLayers(); });
     }

libs/hwui/RenderNode.h

@@ -330,6 +330,11 @@ public:
         } else {
             mSkiaLayer.reset();
         }
+
+        // Clear out the previous snapshot and the image filter the previous
+        // snapshot was created with whenever the layer changes.
+        mSnapshotResult.snapshot = nullptr;
+        mTargetImageFilter = nullptr;
     }
 
     /**