Merge "Fix NPE in BaseStatusbar in onListenerConnected"

2016-02-23 13:51:22 +00:00
parent 5af6dd5463 185e9c2562
commit ffef959ca4
1 changed files with 4 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -442,6 +442,10 @@ public abstract class BaseStatusBar extends SystemUI implements
        public void onListenerConnected() {
            if (DEBUG) Log.d(TAG, "onListenerConnected");
            final StatusBarNotification[] notifications = getActiveNotifications();
+            if (notifications == null) {
+                Log.w(TAG, "onListenerConnected unable to get active notifications.");
+                return;
+            }
            final RankingMap currentRanking = getCurrentRanking();
            mHandler.post(new Runnable() {
                @Override