From 288491c7248156b481966fc01ba94a5733da9020 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Tue, 24 Mar 2020 11:46:48 -0700
Subject: [PATCH] Send attributionTag to notification APIs

Test: TH
Bug: 136595429
Change-Id: I4a5bb43a4aa5bfd88646771a0d1a2394d40e82e2
---
 .../settings/notification/NotificationBackend.java        | 4 ++--
 .../settings/notification/history/HistoryLoader.java      | 3 ++-
 .../notification/history/NotificationHistoryActivity.java | 5 +++--
 .../notification/history/NotificationStation.java         | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index e1b21388050..fb0a438843f 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -397,9 +397,9 @@ public class NotificationBackend {
         return false;
     }
 
-    public NotificationHistory getNotificationHistory(String pkg) {
+    public NotificationHistory getNotificationHistory(String pkg, String attributionTag) {
         try {
-            return sINM.getNotificationHistory(pkg);
+            return sINM.getNotificationHistory(pkg, attributionTag);
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
         }
diff --git a/src/com/android/settings/notification/history/HistoryLoader.java b/src/com/android/settings/notification/history/HistoryLoader.java
index 461bbc1bc07..d598e80ab02 100644
--- a/src/com/android/settings/notification/history/HistoryLoader.java
+++ b/src/com/android/settings/notification/history/HistoryLoader.java
@@ -50,7 +50,8 @@ public class HistoryLoader {
             try {
                 Map<String, NotificationHistoryPackage> historicalNotifications = new HashMap<>();
                 NotificationHistory history =
-                        mBackend.getNotificationHistory(mContext.getPackageName());
+                        mBackend.getNotificationHistory(mContext.getPackageName(),
+                                mContext.getAttributionTag());
                 while (history.hasNextNotification()) {
                     HistoricalNotification hn = history.getNextNotification();
 
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 8c00b5dc88c..ab3d15bd433 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -245,8 +245,9 @@ public class NotificationHistoryActivity extends Activity {
             StatusBarNotification[] dismissed = null;
             try {
                 snoozed = getSnoozedNotifications();
-                dismissed = mNm.getHistoricalNotifications(
-                    NotificationHistoryActivity.this.getPackageName(), 6, false);
+                dismissed = mNm.getHistoricalNotificationsWithAttribution(
+                        NotificationHistoryActivity.this.getPackageName(),
+                        NotificationHistoryActivity.this.getAttributionTag(), 6, false);
             } catch (SecurityException | RemoteException e) {
                 Log.d(TAG, "OnPaused called while trying to retrieve notifications");
             }
diff --git a/src/com/android/settings/notification/history/NotificationStation.java b/src/com/android/settings/notification/history/NotificationStation.java
index 381fb4274fe..3215442321f 100644
--- a/src/com/android/settings/notification/history/NotificationStation.java
+++ b/src/com/android/settings/notification/history/NotificationStation.java
@@ -372,10 +372,10 @@ public class NotificationStation extends SettingsPreferenceFragment {
      */
     private void loadNotifications() {
         try {
-            StatusBarNotification[] active = mNoMan.getActiveNotifications(
-                    mContext.getPackageName());
-            StatusBarNotification[] dismissed = mNoMan.getHistoricalNotifications(
-                    mContext.getPackageName(), 50, false);
+            StatusBarNotification[] active = mNoMan.getActiveNotificationsWithAttribution(
+                    mContext.getPackageName(), mContext.getAttributionTag());
+            StatusBarNotification[] dismissed = mNoMan.getHistoricalNotificationsWithAttribution(
+                    mContext.getPackageName(), mContext.getAttributionTag(), 50, false);
 
             List<HistoricalNotificationInfo> list
                     = new ArrayList<>(active.length + dismissed.length);