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

Commit fc905d6c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore null action in NotificationAttentionHelper." into main am: c4c0175e 

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



Change-Id: Icbe810560520eef54614f630647eaa5fd9d59e2b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b784624 c4c0175e

services/core/java/com/android/server/notification/NotificationAttentionHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -1597,6 +1597,9 @@ public final class NotificationAttentionHelper { 
        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            if (action == null) {

                return;

            }



            if (action.equals(Intent.ACTION_SCREEN_ON)) {

                // Keep track of screen on/off state, but do not turn off the notification light