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

Merge "Fix NPE in logActionClick when we were re-fetching the NotificationEntry we already had." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-06-11 20:04:26 +00:00
committed by Android (Google) Code Review
parent 77ea3710bb 8e9b6f3f4e
commit 293436dfbd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
View File

@@ -221,12 +221,10 @@ public class NotificationRemoteInputManager implements Dumpable {
buttonIndex = actionGroup.indexOfChild(view); buttonIndex = actionGroup.indexOfChild(view);
} }
final int count = mEntryManager.getActiveNotificationsCount(); final int count = mEntryManager.getActiveNotificationsCount();
final int rank = mEntryManager final int rank = entry.getRanking().getRank();
.getActiveNotificationUnfiltered(key).getRanking().getRank();
NotificationVisibility.NotificationLocation location = NotificationVisibility.NotificationLocation location =
NotificationLogger.getNotificationLocation( NotificationLogger.getNotificationLocation(entry);
mEntryManager.getActiveNotificationUnfiltered(key));
final NotificationVisibility nv = final NotificationVisibility nv =
NotificationVisibility.obtain(key, rank, count, true, location); NotificationVisibility.obtain(key, rank, count, true, location);
mClickNotifier.onNotificationActionClick(key, buttonIndex, action, nv, false); mClickNotifier.onNotificationActionClick(key, buttonIndex, action, nv, false);