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

Commit 7443e3de authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

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

parents d227755b 288491c7

src/com/android/settings/notification/NotificationBackend.java

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

        }

src/com/android/settings/notification/history/HistoryLoader.java

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

src/com/android/settings/notification/history/NotificationHistoryActivity.java

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

            }

src/com/android/settings/notification/history/NotificationStation.java

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