Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abc74b85 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in logActionClick when we were re-fetching the... 

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

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

Change-Id: Ie425e48c8a2ff81a629f863c246bca497f2b904d
parents d9e016ca a3521548

packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java

+2 −4
Original line number Diff line number Diff line
@@ -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);