commit 17a79dae7cd5d4e92bbe448e9f0657b7cbe73b00
author John Spurlock <jspurlock@google.com> Wed Aug 27 14:55:54 2014 -0400
committer The Android Automerger <android-build@google.com> Wed Aug 27 14:47:28 2014 -0700
tree e27e62722f60519620adc6e90d449381203dfa80
parent 0189c5643e7073a6051782855b6bf73bca5373f4

Doze: Null check in NotificationContentView.mContractedChild.

Bug: 17247547
Change-Id: Iede5d0cd88db4e293e583f3a3c324354eb6d594e

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 548e7d2..ec45e91 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -202,7 +202,7 @@
     }
 
     public void setDark(boolean dark, boolean fade) {
-        if (mDark == dark) return;
+        if (mDark == dark || mContractedChild == null) return;
         mDark = dark;
         setImageViewDark(dark, fade, com.android.internal.R.id.right_icon);
         setImageViewDark(dark, fade, com.android.internal.R.id.icon);