diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java index 65c80e22b1e14..d3ef2382f6f10 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java @@ -414,10 +414,12 @@ public class KeyguardStatusView extends GridLayout implements int expanded = mOwnerInfo.getBottom() + mOwnerInfo.getPaddingBottom(); int toRemove = (int) ((expanded - collapsed) * ratio); setBottom(getMeasuredHeight() - toRemove); - // We're using scrolling in order not to overload the translation which is used - // when appearing the icons - mNotificationIcons.setScrollY(toRemove); - } else { + if (mNotificationIcons != null) { + // We're using scrolling in order not to overload the translation which is used + // when appearing the icons + mNotificationIcons.setScrollY(toRemove); + } + } else if (mNotificationIcons != null){ mNotificationIcons.setScrollY(0); } }