Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when updating rankings for pending notifs

Browse Source 
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
This commit is contained in:
Ned Burns
2019-09-24 13:14:08 -04:00
parent 230448a368
commit e372f3297e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,10 +514,11 @@ public class NotificationEntryManager implements
if (rankingMap == null) {
return;
}
NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking();
for (NotificationEntry pendingNotification : mPendingNotifications.values()) {
rankingMap.getRanking(pendingNotification.key, ranking);
pendingNotification.setRanking(ranking);
Ranking ranking = new Ranking();
if (rankingMap.getRanking(pendingNotification.key(), ranking)) {
pendingNotification.setRanking(ranking);
}
}
}