Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e372f329 authored by Ned Burns's avatar Ned Burns
Browse files

Fix NPE when updating rankings for pending notifs 

Only assign rankings to pending notifs if our current RankingMap
actually has one for that key. Previously we were assigning blank
rankings to those notifs, which was causing an NPE later down the road.

Test: atest
Bug: 141379517
Change-Id: I1e9b3c33adf75a7082dfe17b4915b0f4966da284
parent 230448a3

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+6 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.app.Notification;

import android.content.Context;

import android.service.notification.NotificationListenerService;

import android.service.notification.NotificationListenerService.Ranking;

import android.service.notification.StatusBarNotification;

import android.util.ArrayMap;

import android.util.Log;
@@ -390,7 +391,7 @@ public class NotificationEntryManager implements 
        }



        mNotificationData.updateRanking(rankingMap);

        NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking();

        Ranking ranking = new Ranking();

        rankingMap.getRanking(key, ranking);



        NotificationEntry entry = new NotificationEntry(notification, ranking);
@@ -513,12 +514,13 @@ public class NotificationEntryManager implements 
        if (rankingMap == null) {

            return;

        }

        NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking();

        for (NotificationEntry pendingNotification : mPendingNotifications.values()) {

            rankingMap.getRanking(pendingNotification.key, ranking);

            Ranking ranking = new Ranking();

            if (rankingMap.getRanking(pendingNotification.key(), ranking)) {

                pendingNotification.setRanking(ranking);

            }

        }

    }



    /**

     * @return An iterator for all "pending" notifications. Pending notifications are newly-posted