commit e03688068f320d0401ba2dc5e10c85fc6d2affaa
author Mady Mellor <madym@google.com> Mon Feb 22 18:54:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 22 18:54:40 2016 +0000
tree 559d351109f9fe4b21f9d87ee488ba6c55dbcd9d
parent f0febdcf90af31f8e5a0b86dc079108e99ebd514
parent 3cb40246f1fc138e6a01a53f3500cf234516a58b

Merge "Fix crash when clearing all notifications" into nyc-dev

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index f078b53..8f9a224 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -3045,7 +3045,7 @@
             disableClipOptimization();
         }
         handleDismissAllClipping();
-        if (mCurrIconRow != null & mCurrIconRow.isVisible()) {
+        if (mCurrIconRow != null && mCurrIconRow.isVisible()) {
             mCurrIconRow.getNotificationParent().animateTranslateNotification(0 /* left target */);
         }
     }