commit 622e32bb6a2d3f79212fb236d77a8deedb207116
author Selim Cinek <cinek@google.com> Mon Apr 28 18:28:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 28 18:28:32 2014 +0000
tree 436eaee38bb82c8307436acb5213691693457878
parent fb875cb028aba3e8b46de3c75dcbccfa63b4fef5
parent 2ba5f1f4e328dc2da47363a9feda75d5fdb9a4af

Merge "Fixed race condition regarding first child max height"

packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index d9e7f66..8757d57 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -542,9 +542,13 @@
                                 public void onLayoutChange(View v, int left, int top, int right,
                                         int bottom, int oldLeft, int oldTop, int oldRight,
                                         int oldBottom) {
-                                    mFirstChildMaxHeight = getMaxAllowedChildHeight(
-                                            mFirstChildWhileExpanding);
-                                    mFirstChildWhileExpanding.removeOnLayoutChangeListener(this);
+                                    if (mFirstChildWhileExpanding != null) {
+                                        mFirstChildMaxHeight = getMaxAllowedChildHeight(
+                                                mFirstChildWhileExpanding);
+                                    } else {
+                                        mFirstChildMaxHeight = 0;
+                                    }
+                                    v.removeOnLayoutChangeListener(this);
                                 }
                             });
                 } else {