commit ceb9d37820639b6a6f63af1a6066100d3ded32a9
author Selim Cinek <cinek@google.com> Thu Aug 14 11:19:41 2014 +0200
committer The Android Automerger <android-build@google.com> Thu Aug 14 11:57:27 2014 -0700
tree 85e5b17297026118433a20155a62d4897a668811
parent 310ee198cd1a0b5f3b524112cd095d03b180e506

Fixed a NPE during setup wizard

The heightChangedListener might not be set.

Bug: 17000238
Change-Id: I3e930d22eeaeea5984c089d3f76c91997e4a2b01

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
index df64edf..5b0bf03 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
@@ -256,7 +256,9 @@
     }
 
     public void reset() {
-        mOnHeightChangedListener.onReset(this);
+        if (mOnHeightChangedListener != null) {
+            mOnHeightChangedListener.onReset(this);
+        }
     }
 
     /**