PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Send attributionTag to notification APIs" into rvc-dev

Browse Source
This commit is contained in:
Philip P. Moltmann
2020-03-24 23:53:51 +00:00
committed by Android (Google) Code Review
parent d227755be8 288491c724
commit 7443e3de6e
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/notification/NotificationBackend.java
View File

@@ -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);
}

3
src/com/android/settings/notification/history/HistoryLoader.java
View File

@@ -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();

5
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -246,8 +246,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");
}

8
src/com/android/settings/notification/history/NotificationStation.java
View File

@@ -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);