commit a487ab13682d6e60c6ff41a5b9f708b752efc776
author Kirill Grouchnikov <kirillg@google.com> Tue Mar 15 16:25:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 15 16:25:50 2016 +0000
tree c3ffc10ebacc4a69fb62af6c382fd5837083fefd
parent 47ad0f2be512785261a9474eca146f64e1c821d3
parent 22351c32cb23aebe0dccbe384b3a720e79e5b13a

Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev

core/java/android/view/ViewOverlay.java

diff --git a/core/java/android/view/ViewOverlay.java b/core/java/android/view/ViewOverlay.java
index 69c30ba..b770bd5 100644
--- a/core/java/android/view/ViewOverlay.java
+++ b/core/java/android/view/ViewOverlay.java
@@ -216,6 +216,9 @@
         public void clear() {
             removeAllViews();
             if (mDrawables != null) {
+                for (Drawable drawable : mDrawables) {
+                    drawable.setCallback(null);
+                }
                 mDrawables.clear();
             }
         }