Merge "Fix merge for OnDrawListener" (7198ca86) · Commits · e / os / android_frameworks_base

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