commit 7198ca863e57a04319efd376770a912b508d3e4a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 14 20:12:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 14 20:12:35 2016 +0000
tree d7f7ca1d03791d25652b922043e48ea2d67b9792
parent d0797e0bbdadc06cd1be9d481a09fb4de5724e9f
parent 9f8ec54244a5e0343b9748db3329733f259604f3

Merge "Fix merge for OnDrawListener"

core/java/android/view/ViewTreeObserver.java

diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java
index 7dd2fc2..e4d4e7b 100644
--- a/core/java/android/view/ViewTreeObserver.java
+++ b/core/java/android/view/ViewTreeObserver.java
@@ -385,6 +385,14 @@
             }
         }
 
+        if (observer.mOnDrawListeners != null) {
+            if (mOnDrawListeners != null) {
+                mOnDrawListeners.addAll(observer.mOnDrawListeners);
+            } else {
+                mOnDrawListeners = observer.mOnDrawListeners;
+            }
+        }
+
         if (observer.mOnTouchModeChangeListeners != null) {
             if (mOnTouchModeChangeListeners != null) {
                 mOnTouchModeChangeListeners.addAll(observer.mOnTouchModeChangeListeners);