From 757c697f73561ef4cfae9e3da64e9b2894d24147 Mon Sep 17 00:00:00 2001
From: Mark Brophy <mbrophy@google.com>
Date: Tue, 25 Oct 2011 17:01:28 +0100
Subject: [PATCH] Fix scroll listeners lost in ViewTreeObserver.

Bug: 5512156
Change-Id: I4bb7ccab39053ae75a4bef9309ab334a4ccecf51
---
 core/java/android/view/ViewTreeObserver.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java
index db8717517e489..c53fc6b4010ae 100644
--- a/core/java/android/view/ViewTreeObserver.java
+++ b/core/java/android/view/ViewTreeObserver.java
@@ -288,6 +288,14 @@ public final class ViewTreeObserver {
             }
         }
 
+        if (observer.mOnScrollChangedListeners != null) {
+            if (mOnScrollChangedListeners != null) {
+                mOnScrollChangedListeners.addAll(observer.mOnScrollChangedListeners);
+            } else {
+                mOnScrollChangedListeners = observer.mOnScrollChangedListeners;
+            }
+        }
+
         observer.kill();
     }