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

Commit 7796b6a9 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix VIP conversations alerting incorrectly." into sc-dev am: b52ccdca am: abe29ba8

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

Change-Id: Ib22bfedccfa3ceaf0d3d66444cf0e40a94ad28f5
parents aa432e50 abe29ba8
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 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;
@@ -35,6 +34,7 @@ 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,6 +46,7 @@ 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;
+400 −38

File changed.

Preview size limit exceeded, changes collapsed.

+285 −78

File changed.

Preview size limit exceeded, changes collapsed.