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 am: 293436dfbd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937771

Change-Id: I4ffb2f4035aff5874c02fa563425f468d1fb32e8
This commit is contained in:
Jeff DeCew
2021-06-11 20:17:57 +00:00
committed by Automerger Merge Worker
parent d4ca12285d 293436dfbd
commit a3521548db
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);
}
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);