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

Commit f5fae39a authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug where a notification could get removed"

parents d18a4574 2d79f634

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

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.service.notification.NotificationListenerService; 
import android.service.notification.NotificationListenerService.RankingMap;

import android.service.notification.StatusBarNotification;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.Log;

import android.util.Slog;

import android.util.SparseArray;
@@ -175,6 +176,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
    protected boolean mDeviceInteractive;



    protected boolean mVisible;

    protected ArraySet<Entry> mHeadsUpEntriesToRemoveOnSwitch = new ArraySet<>();



    // mScreenOnFromKeyguard && mVisible.

    private boolean mVisibleToUser;
@@ -2016,6 +2018,8 @@ public abstract class BaseStatusBar extends SystemUI implements 
        Entry entry = mNotificationData.get(key);

        if (entry == null) {

            return;

        } else if (mHeadsUpEntriesToRemoveOnSwitch.contains(entry)) {

            mHeadsUpEntriesToRemoveOnSwitch.remove(entry);

        }



        Notification n = notification.getNotification();

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

+0 −1
Original line number Diff line number Diff line
@@ -617,7 +617,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    };

    private HashMap<ExpandableNotificationRow, List<ExpandableNotificationRow>> mTmpChildOrderMap

            = new HashMap<>();

    private HashSet<Entry> mHeadsUpEntriesToRemoveOnSwitch = new HashSet<>();

    private RankingMap mLatestRankingMap;

    private boolean mNoAnimationOnNextBarModeChange;

    private FalsingManager mFalsingManager;