Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f8ec542 authored by John Reck's avatar John Reck
Browse files

Fix merge for OnDrawListener 

Test: CTS tests for PixelCopy pass; without this
they time out as they never get the OnDraw call.

Change-Id: I6acced4699182b969f38a606a1314b2ffb38d760
parent 912bebeb

core/java/android/view/ViewTreeObserver.java

+8 −0
Original line number Diff line number Diff line
@@ -385,6 +385,14 @@ public final class ViewTreeObserver { 
            }

        }



        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);