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

2016-02-22 18:54:39 +00:00
parent f0febdcf90 3cb40246f1
commit e03688068f
1 changed files with 1 additions and 1 deletions
--- 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 @@ public class NotificationStackScrollLayout extends ViewGroup
            disableClipOptimization();
        }
        handleDismissAllClipping();
-        if (mCurrIconRow != null & mCurrIconRow.isVisible()) {
+        if (mCurrIconRow != null && mCurrIconRow.isVisible()) {
            mCurrIconRow.getNotificationParent().animateTranslateNotification(0 /* left target */);
        }
    }