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

Commit 0e5eab5c authored by Rohan Shah's avatar Rohan Shah Committed by android-build-merger
Browse files

Merge "[Notif] Limit shown events to manager.show" into pi-dev am: 0ec2e088 

am: f5f0881f

Change-Id: I01506698732afad2091505a163b105a4a74eedfe
parents e0cfea7c f5f0881f

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

+5 −0
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ import android.service.notification.StatusBarNotification; 
import androidx.annotation.VisibleForTesting;

import android.util.Log;



import com.android.internal.logging.MetricsLogger;

import com.android.systemui.Dependency;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.statusbar.notification.NotificationCounters;

import com.android.systemui.statusbar.phone.StatusBar;



import java.util.Collections;
@@ -97,6 +99,9 @@ public class NotificationBlockingHelperManager { 
            // We don't care about the touch origin (x, y) since we're opening guts without any

            // explicit user interaction.

            manager.openGuts(mBlockingHelperRow, 0, 0, menuRow.getLongpressMenuItem(mContext));



            Dependency.get(MetricsLogger.class)

                    .count(NotificationCounters.BLOCKING_HELPER_SHOWN, 1);

            return true;

        }

        return false;

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

+0 −2
Original line number Diff line number Diff line
@@ -199,8 +199,6 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
        bindHeader();

        bindPrompt();

        bindButtons();



        logBlockingHelperCounter(NotificationCounters.BLOCKING_HELPER_SHOWN);

    }



    private void bindHeader() throws RemoteException {