Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev

This commit is contained in:
John Spurlock
2014-08-27 19:15:02 +00:00
committed by Android (Google) Code Review

View File

@@ -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);