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

This commit is contained in:
Jeff DeCew
2021-06-11 20:04:26 +00:00
committed by Android (Google) Code Review

View File

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