From b75a0426d8c2339f2d552f96cc4dfcd86deb3447 Mon Sep 17 00:00:00 2001 From: Diego Perez Date: Mon, 1 Feb 2016 11:48:16 +0000 Subject: [PATCH] DO NOT MERGE: Fix Canvas memory leak Every RenderSession would call the AttachInfo.setAttachInfo but wouldn't issue a View.dispatchDetachedFromWindow. This caused some Canvas to be slowly leaked in the DelegateManager in every session. Change-Id: Ib0392303e6d00a4fe5494ae484f28135b1fe6b28 --- .../src/android/view/AttachInfo_Accessor.java | 6 +++ .../view/ViewRootImpl_RunQueue_Delegate.java | 37 +++++++++++++++++++ .../layoutlib/bridge/BridgeRenderSession.java | 3 ++ .../bridge/impl/RenderSessionImpl.java | 17 +++++++++ .../layoutlib/bridge/intensive/Main.java | 3 +- .../tools/layoutlib/create/CreateInfo.java | 1 + 6 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 tools/layoutlib/bridge/src/android/view/ViewRootImpl_RunQueue_Delegate.java diff --git a/tools/layoutlib/bridge/src/android/view/AttachInfo_Accessor.java b/tools/layoutlib/bridge/src/android/view/AttachInfo_Accessor.java index 4901f72b23d6b..94f3f546d0c37 100644 --- a/tools/layoutlib/bridge/src/android/view/AttachInfo_Accessor.java +++ b/tools/layoutlib/bridge/src/android/view/AttachInfo_Accessor.java @@ -45,4 +45,10 @@ public class AttachInfo_Accessor { public static void dispatchOnPreDraw(View view) { view.mAttachInfo.mTreeObserver.dispatchOnPreDraw(); } + + public static void detachFromWindow(View view) { + if (view != null) { + view.dispatchDetachedFromWindow(); + } + } } diff --git a/tools/layoutlib/bridge/src/android/view/ViewRootImpl_RunQueue_Delegate.java b/tools/layoutlib/bridge/src/android/view/ViewRootImpl_RunQueue_Delegate.java new file mode 100644 index 0000000000000..51b42a626a2ed --- /dev/null +++ b/tools/layoutlib/bridge/src/android/view/ViewRootImpl_RunQueue_Delegate.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view; + +import com.android.tools.layoutlib.annotations.LayoutlibDelegate; + +/** + * Delegate used to provide new implementation of a select few methods of + * {@link ViewRootImpl.RunQueue} + * + * Through the layoutlib_create tool, the original methods of ViewRootImpl.RunQueue have been + * replaced by calls to methods of the same name in this delegate class. + * + */ +public class ViewRootImpl_RunQueue_Delegate { + + @LayoutlibDelegate + /*package*/ static void postDelayed(ViewRootImpl.RunQueue thisQueue, Runnable action, long + delayMillis) { + // The actual RunQueue is never run and therefore never cleared. This method avoids + // runnables to be added to the RunQueue so they do not leak resources. + } +} diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java index 2ac212c312c09..fea633e7036db 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java @@ -208,6 +208,9 @@ public class BridgeRenderSession extends RenderSession { @Override public void dispose() { + if (mSession != null) { + mSession.dispose(); + } } /*package*/ BridgeRenderSession(RenderSessionImpl scene, Result lastResult) { diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java index ec50cfe556516..99af226e4c4c1 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java @@ -1396,4 +1396,21 @@ public class RenderSessionImpl extends RenderAction { public RenderSession getSession() { return mScene; } + + public void dispose() { + AttachInfo_Accessor.detachFromWindow(mViewRoot); + if (mCanvas != null) { + mCanvas.release(); + mCanvas = null; + } + if (mViewInfoList != null) { + mViewInfoList.clear(); + } + if (mSystemViewInfoList != null) { + mSystemViewInfoList.clear(); + } + mImage = null; + mViewRoot = null; + mContentRoot = null; + } } diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java index fe16a3ed8459a..6b23da71861a8 100644 --- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java @@ -291,7 +291,6 @@ public class Main { @Test public void testActivity() throws ClassNotFoundException { renderAndVerify("activity.xml", "activity.png"); - } /** Test allwidgets.xml */ @@ -431,6 +430,8 @@ public class Main { ImageUtils.requireSimilar(goldenImagePath, session.getImage()); } catch (IOException e) { getLogger().error(e, e.getMessage()); + } finally { + session.dispose(); } } diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java index b2fe214d38994..9912b75c97cba 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java @@ -185,6 +185,7 @@ public final class CreateInfo implements ICreateInfo { "android.view.View#getWindowToken", "android.view.View#isInEditMode", "android.view.ViewRootImpl#isInTouchMode", + "android.view.ViewRootImpl$RunQueue#postDelayed", "android.view.WindowManagerGlobal#getWindowManagerService", "android.view.inputmethod.InputMethodManager#getInstance", "android.view.MenuInflater#registerMenu",