commit 00b4b2d9ac015d18b49524df1748b4f79e57b31c
author Ned Burns <pixel@google.com> Thu Oct 17 22:09:27 2019 -0400
committer Ned Burns <pixel@google.com> Fri Oct 18 11:36:36 2019 -0400
tree f4174a94578fde2e887e0b7654adcbcb47e7ed25
parent 291a46e4f4a72c3cb07c9f2c8539ea1a5bc6228c

Encapsulate NotifEntry.key and .notification

NotificationEntry.key -> getKey()
NotificationEntry.notification -> getSbn()

.key -> mKey
.notification -> mSbn

Test: atest
Change-Id: Idcc56af5d941d600b2958afb9ed898fd7ab361cc

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
index 6f953d5..1d9f6b2 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
@@ -501,7 +501,7 @@
         if (id == R.id.settings_button) {
             Intent intent = mBubble.getSettingsIntent();
             mStackView.collapseStack(() -> {
-                mContext.startActivityAsUser(intent, mBubble.getEntry().notification.getUser());
+                mContext.startActivityAsUser(intent, mBubble.getEntry().getSbn().getUser());
                 logBubbleClickEvent(mBubble,
                         StatsLog.BUBBLE_UICHANGED__ACTION__HEADER_GO_TO_SETTINGS);
             });
@@ -609,7 +609,7 @@
      * @param action the user interaction enum.
      */
     private void logBubbleClickEvent(Bubble bubble, int action) {
-        StatusBarNotification notification = bubble.getEntry().notification;
+        StatusBarNotification notification = bubble.getEntry().getSbn();
         StatsLog.write(StatsLog.BUBBLE_UI_CHANGED,
                 notification.getPackageName(),
                 notification.getNotification().getChannelId(),