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

Commit 67252b71 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Inline NotificationPulsingFix flag" into main

parents b6a05de8 d12cb37b

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1359,16 +1359,6 @@ flag { 
  }

}



flag {

  name: "notification_pulsing_fix"

  namespace: "systemui"

  description: "Allow showing new pulsing notifications when the device is already pulsing."

  bug: "335560575"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "media_lockscreen_launch_animation"

    namespace : "systemui"

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+1 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.InstanceId;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.Flags;

import com.android.systemui.biometrics.AuthController;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dock.DockManager;
@@ -566,8 +565,7 @@ public class DozeTriggers implements DozeMachine.Part { 
        }



        // When already in pulsing, we can show the new Notification without requesting a new pulse.

        if (Flags.notificationPulsingFix()

                && dozeState == State.DOZE_PULSING && reason == DozeLog.PULSE_REASON_NOTIFICATION) {

        if (dozeState == State.DOZE_PULSING && reason == DozeLog.PULSE_REASON_NOTIFICATION) {

            return;

        }

packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java

+0 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import androidx.test.filters.SmallTest; 


import com.android.internal.logging.InstanceId;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.biometrics.AuthController;

import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -222,7 +221,6 @@ public class DozeTriggersTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_NOTIFICATION_PULSING_FIX)

    public void testOnNotification_alreadyPulsing_notificationNotSuppressed() {

        // GIVEN device is pulsing

        Runnable pulseSuppressListener = mock(Runnable.class);