commit b36816dfc612726cd9fe80dd712fba9b0a43a6cc
author Jerome Gaillard <jgaillard@google.com> Wed Apr 24 16:29:49 2019 +0100
committer Jerome Gaillard <jgaillard@google.com> Wed Apr 24 17:19:45 2019 +0000
tree 7e44c3553db30fd36984643dbbf4d04a2ed546e1
parent 32976980862477a0dbe2457c8b5c20424501c802

Detach root from window in RenderDrawable

RenderDrawable.renderImage attaches AttachInfo to the root FrameLayout.
This ensures that it is detached after the rendering has been done, so
as not to leak the views.

Bug: 130817348
Test: AddAssetMemoryUseTest from Android Studio
Change-Id: I7650fe72047975ee40d22177a5fb26e01ce72573
(cherry picked from commit 2d16c06fe4d865127a5949422051a53c9fe086df)

bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java

diff --git a/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java b/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java
index 35ec77b..d6e01a3 100644
--- a/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java
+++ b/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java
@@ -162,6 +162,10 @@
 
         // Draw.
         content.draw(canvas);
+
+        // Detach root from window after draw.
+        AttachInfo_Accessor.detachFromWindow(content);
+
         return image;
     }