summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff DeCew <jeffdq@google.com> 2021-06-10 13:31:22 -0400
committer Jeff DeCew <jeffdq@google.com> 2021-06-10 13:33:49 -0400
commit8e9b6f3f4e4365fd5971cd5630030b51cd80216f (patch)
tree3c6e7fa89503eb80ed4a6574ebd62f643df662ce
parent6c9c6cb626f16c491131e73fd6957d261edf2533 (diff)
Fix NPE in logActionClick when we were re-fetching the NotificationEntry we already had.
Fixes: 189234737 Test: click a bunch of actions Change-Id: I295eaadbef9f31b10e92f6d04d80cfe367a22af0
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
index ca81a7b43df6..0b67e7eeb132 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
@@ -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);