From c3dfd328438369793c71fe7dfa419f3abd3f7d82 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 27 Aug 2014 14:55:54 -0400 Subject: [PATCH] Doze: Null check in NotificationContentView.mContractedChild. Bug: 17247547 Change-Id: Iede5d0cd88db4e293e583f3a3c324354eb6d594e --- .../com/android/systemui/statusbar/NotificationContentView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java index e6eca22e4a2de..8b4c2c4e44ce8 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 class NotificationContentView extends FrameLayout { } 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);