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

Commit c1ce0bbd authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Mark actually seen notifications as seen" into mnc-dev

parents 513f7c33 24bd0be5

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

+0 −13
Original line number Diff line number Diff line
@@ -708,18 +708,6 @@ public abstract class BaseStatusBar extends SystemUI implements 
        mNotificationListener.setNotificationsShown(keys);

    }



    protected void setNotificationsShownAll() {

        ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();

        final int N = activeNotifications.size();



        String[] keys = new String[N];

        for (int i = 0; i < N; i++) {

            NotificationData.Entry entry = activeNotifications.get(i);

            keys[i] = entry.key;

        }

        setNotificationsShown(keys);

    }



    protected boolean isCurrentProfile(int userId) {

        synchronized (mCurrentProfiles) {

            return userId == UserHandle.USER_ALL || mCurrentProfiles.get(userId) != null;
@@ -1701,7 +1689,6 @@ public abstract class BaseStatusBar extends SystemUI implements 
                boolean clearNotificationEffects =

                        (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED);

                mBarService.onPanelRevealed(clearNotificationEffects);

                setNotificationsShownAll();

            } else {

                mBarService.onPanelHidden();

            }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+1 −0
Original line number Diff line number Diff line
@@ -2852,6 +2852,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        } catch (RemoteException e) {

            // Ignore.

        }

        setNotificationsShown(newlyVisibleAr);

    }



    // State logging

services/core/java/com/android/server/notification/NotificationRecord.java

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ public final class NotificationRecord { 
                + " / " + idDebugString(baseContext, sbn.getPackageName(), notification.icon));

        pw.println(prefix + "  pri=" + notification.priority + " score=" + sbn.getScore());

        pw.println(prefix + "  key=" + sbn.getKey());

        pw.println(prefix + "  seen=" + mIsSeen);

        pw.println(prefix + "  groupKey=" + getGroupKey());

        pw.println(prefix + "  contentIntent=" + notification.contentIntent);

        pw.println(prefix + "  deleteIntent=" + notification.deleteIntent);