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

Commit cb643c58 authored by Daniel Chapin's avatar Daniel Chapin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix VIP conversations alerting incorrectly."" into sc-dev am: eed65ac6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14413041

Change-Id: I71e15fa2828b2817ab4637bf609e7808e205f3d9
parents fe4caef6 eed65ac6
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar;

import static com.android.systemui.statusbar.RemoteInputController.processForRemoteInput;
import static com.android.systemui.statusbar.notification.NotificationEntryManager.UNDEFINED_DISMISS_REASON;
import static com.android.systemui.statusbar.phone.StatusBar.DEBUG;

import android.annotation.NonNull;
import android.annotation.SuppressLint;
@@ -34,7 +35,6 @@ import android.util.Log;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.statusbar.dagger.StatusBarModule;
import com.android.systemui.statusbar.phone.NotificationListenerWithPlugins;
import com.android.systemui.statusbar.phone.StatusBar;

import java.util.ArrayList;
import java.util.List;
@@ -46,7 +46,6 @@ import java.util.List;
@SuppressLint("OverrideAbstract")
public class NotificationListener extends NotificationListenerWithPlugins {
    private static final String TAG = "NotificationListener";
    private static final boolean DEBUG = StatusBar.DEBUG;

    private final Context mContext;
    private final NotificationManager mNotificationManager;
+38 −400

File changed.

Preview size limit exceeded, changes collapsed.

+78 −285

File changed.

Preview size limit exceeded, changes collapsed.