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

Commit 1dd6b40b authored by Ned Burns's avatar Ned Burns
Browse files

Mark entry in onEntryRemoved as @Nullable 

We should eventually modify logic so entry can never be null.

Bug: 122169343
Test: Manual, SystemUITests
Change-Id: Ib4312b7ddff4c6b7bf35e2ea3d5462cfc12b1e11
parent 583ca98e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ public class NotificationMediaManager implements Dumpable { 
        notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

        notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

            @Override

            @Override

            public void onEntryRemoved(

            public void onEntryRemoved(

                    Entry entry,

                    @Nullable Entry entry,

                    String key,

                    String key,

                    StatusBarNotification old,

                    StatusBarNotification old,

                    NotificationVisibility visibility,

                    NotificationVisibility visibility,

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN_OR_SPLIT 
import static com.android.systemui.Dependency.MAIN_HANDLER_NAME;

import static com.android.systemui.Dependency.MAIN_HANDLER_NAME;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.ActivityOptions;

import android.app.KeyguardManager;

import android.app.KeyguardManager;
@@ -252,13 +253,13 @@ public class NotificationRemoteInputManager implements Dumpable { 
        notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

        notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

            @Override

            @Override

            public void onEntryRemoved(

            public void onEntryRemoved(

                    NotificationData.Entry entry,

                    @Nullable NotificationData.Entry entry,

                    String key,

                    String key,

                    StatusBarNotification old,

                    StatusBarNotification old,

                    NotificationVisibility visibility,

                    NotificationVisibility visibility,

                    boolean lifetimeExtended,

                    boolean lifetimeExtended,

                    boolean removedByUser) {

                    boolean removedByUser) {

                if (removedByUser) {

                if (removedByUser && entry != null) {

                    onPerformRemoveNotification(entry, key);

                    onPerformRemoveNotification(entry, key);

                }

                }

            }

            }

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.statusbar.NotificationRemoteInputManager.FORC 
import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;

import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;

import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP;

import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP;





import android.annotation.Nullable;

import android.app.Notification;

import android.app.Notification;

import android.service.notification.StatusBarNotification;

import android.service.notification.StatusBarNotification;

import android.util.Log;

import android.util.Log;
@@ -82,7 +83,7 @@ public class NotificationAlertingManager { 




            @Override

            @Override

            public void onEntryRemoved(

            public void onEntryRemoved(

                    NotificationData.Entry entry,

                    @Nullable NotificationData.Entry entry,

                    String key,

                    String key,

                    StatusBarNotification old,

                    StatusBarNotification old,

                    NotificationVisibility visibility,

                    NotificationVisibility visibility,

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ public interface NotificationEntryListener { 
     * @param removedByUser true if the notification was removed by a user action

     * @param removedByUser true if the notification was removed by a user action

     */

     */

    default void onEntryRemoved(

    default void onEntryRemoved(

            NotificationData.Entry entry,

            @Nullable NotificationData.Entry entry,

            String key,

            String key,

            StatusBarNotification old,

            StatusBarNotification old,

            @Nullable NotificationVisibility visibility,

            @Nullable NotificationVisibility visibility,

packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

 */

package com.android.systemui.statusbar.notification.logging;

package com.android.systemui.statusbar.notification.logging;





import android.annotation.Nullable;

import android.content.Context;

import android.content.Context;

import android.os.Handler;

import android.os.Handler;

import android.os.RemoteException;

import android.os.RemoteException;
@@ -167,13 +168,13 @@ public class NotificationLogger implements StateListener { 
        entryManager.addNotificationEntryListener(new NotificationEntryListener() {

        entryManager.addNotificationEntryListener(new NotificationEntryListener() {

            @Override

            @Override

            public void onEntryRemoved(

            public void onEntryRemoved(

                    NotificationData.Entry entry,

                    @Nullable NotificationData.Entry entry,

                    String key,

                    String key,

                    StatusBarNotification old,

                    StatusBarNotification old,

                    NotificationVisibility visibility,

                    NotificationVisibility visibility,

                    boolean lifetimeExtended,

                    boolean lifetimeExtended,

                    boolean removedByUser) {

                    boolean removedByUser) {

                if (removedByUser && visibility != null) {

                if (removedByUser && visibility != null && entry.notification != null) {

                    logNotificationClear(key, entry.notification, visibility);

                    logNotificationClear(key, entry.notification, visibility);

                }

                }

            }

            }