commit f6d63f936b0bf18acfc2296943f71e07a66d59c4
author Selim Cinek <cinek@google.com> Wed Jun 12 10:00:47 2019 -0700
committer Selim Cinek <cinek@google.com> Wed Jun 12 10:00:47 2019 -0700
tree a06ba3f98831b10fea7b51f850cbfb3d154779b6
parent abb9bd35c7ce3c5e629bb5b676ecadf336be5d07

Fixes a crash with KeyguardStatusView in tests

Fixes: 135104079
Change-Id: Idb0b745e50d72ddf23e98582b6a93f1dd56ec9e7

packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
index 65c80e2..d3ef238 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
@@ -414,10 +414,12 @@
             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);
         }
     }