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

Commit 646ff215 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Do not wake AOD for hidden notifications" into udc-dev am: c429c8d0 am: 59092c79"

parents b0ca7c04 5a36fb70

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptLogger.kt

+8 −0
Original line number Diff line number Diff line
@@ -234,6 +234,14 @@ class NotificationInterruptLogger @Inject constructor( 
        })

    }



    fun logNoPulsingNotificationHidden(entry: NotificationEntry) {

        buffer.log(TAG, DEBUG, {

            str1 = entry.logKey

        }, {

            "No pulsing: notification hidden on lock screen: $str1"

        })

    }



    fun logNoPulsingNotImportant(entry: NotificationEntry) {

        buffer.log(TAG, DEBUG, {

            str1 = entry.logKey

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -482,6 +482,12 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
            return false;

        }



        if (entry.getRanking().getLockscreenVisibilityOverride()

                == Notification.VISIBILITY_PRIVATE) {

            if (log) mLogger.logNoPulsingNotificationHidden(entry);

            return false;

        }



        if (entry.getImportance() < NotificationManager.IMPORTANCE_DEFAULT) {

            if (log) mLogger.logNoPulsingNotImportant(entry);

            return false;

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java

+18 −0
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ package com.android.systemui.statusbar.notification.interruption; 
import static android.app.Notification.FLAG_BUBBLE;

import static android.app.Notification.FLAG_FOREGROUND_SERVICE;

import static android.app.Notification.GROUP_ALERT_SUMMARY;

import static android.app.Notification.VISIBILITY_PRIVATE;

import static android.app.NotificationManager.IMPORTANCE_DEFAULT;

import static android.app.NotificationManager.IMPORTANCE_HIGH;

import static android.app.NotificationManager.IMPORTANCE_LOW;

import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;

import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;

import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;

import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE;



import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking;

import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;
@@ -222,9 +224,25 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        ensureStateForHeadsUpWhenDozing();



        NotificationEntry entry = createNotification(IMPORTANCE_DEFAULT);

        modifyRanking(entry)

                .setVisibilityOverride(VISIBILITY_NO_OVERRIDE)

                .build();



        assertThat(mNotifInterruptionStateProvider.shouldHeadsUp(entry)).isTrue();

    }



    @Test

    public void testShouldHeadsUpWhenDozing_hiddenOnLockscreen() {

        ensureStateForHeadsUpWhenDozing();



        NotificationEntry entry = createNotification(IMPORTANCE_DEFAULT);

        modifyRanking(entry)

                .setVisibilityOverride(VISIBILITY_PRIVATE)

                .build();



        assertThat(mNotifInterruptionStateProvider.shouldHeadsUp(entry)).isFalse();

    }



    @Test

    public void testShouldNotHeadsUpWhenDozing_pulseDisabled() {

        // GIVEN state for "heads up when dozing" is true