Fix null handling
Test: cts verifier, notification listener
Fixes: 177202279
Change-Id: Ib25915b0b5a60e9c39986d3ba3af3073e9d2b822
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 43d1700..f4377ea 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -595,12 +595,13 @@
}
public NotificationListenerFilter getListenerFilter(ComponentName cn, int userId) {
+ NotificationListenerFilter nlf = null;
try {
- return sINM.getListenerFilter(cn, userId);
+ nlf = sINM.getListenerFilter(cn, userId);
} catch (Exception e) {
Log.w(TAG, "Error calling NoMan", e);
}
- return new NotificationListenerFilter();
+ return nlf != null ? nlf : new NotificationListenerFilter();
}
public void setListenerFilter(ComponentName cn, int userId, NotificationListenerFilter nlf) {