am 8354e284: am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev

* commit '8354e2846d962b054c85832b62b621bd8ae1ff48':
  Doze: Null check in NotificationContentView.mContractedChild.
This commit is contained in:
John Spurlock
2014-08-27 21:35:55 +00:00
committed by Android Git Automerger

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