commit e89bebe96f547fc7e6badf3e2bc80eebdda7793c
author Julia Reynolds <juliacr@google.com> Fri Apr 01 09:47:32 2016 -0400
committer Julia Reynolds <juliacr@google.com> Fri Apr 01 09:47:32 2016 -0400
tree dcb4ca4f5994cf6fb92ef38cd5bbd87969b48179
parent 63096e965c1ff95b8b7eed53388aa00014500381

Add null checks on filters.

Bug: 27496323
Change-Id: If8883279af11218042f420509c3a8e7b168c815f

src/com/android/settings/applications/AppStateNotificationBridge.java

diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java
index e8db2aa..b936351 100644
--- a/src/com/android/settings/applications/AppStateNotificationBridge.java
+++ b/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -70,6 +70,9 @@
 
         @Override
         public boolean filterApp(AppEntry info) {
+            if (info == null || info.extraInfo == null) {
+                return false;
+            }
             if (info.extraInfo instanceof AppRow) {
                 AppRow row = (AppRow) info.extraInfo;
                 return row.banned;
@@ -85,7 +88,7 @@
 
         @Override
         public boolean filterApp(AppEntry info) {
-            if (info == null) {
+            if (info == null || info.extraInfo == null) {
                 return false;
             }
             AppRow row = (AppRow) info.extraInfo;
@@ -101,7 +104,10 @@
 
         @Override
         public boolean filterApp(AppEntry info) {
-            return info.extraInfo != null && ((AppRow) info.extraInfo).appBypassDnd;
+            if (info == null || info.extraInfo == null) {
+                return false;
+            }
+            return ((AppRow) info.extraInfo).appBypassDnd;
         }
     };
 
@@ -112,7 +118,10 @@
 
         @Override
         public boolean filterApp(AppEntry info) {
-            return info.extraInfo != null && ((AppRow) info.extraInfo).lockScreenSecure
+            if (info == null || info.extraInfo == null) {
+                return false;
+            }
+            return ((AppRow) info.extraInfo).lockScreenSecure
                     && ((AppRow) info.extraInfo).appVisOverride == Notification.VISIBILITY_PRIVATE;
         }
     };
@@ -124,7 +133,10 @@
 
         @Override
         public boolean filterApp(AppEntry info) {
-            return info.extraInfo != null && ((AppRow) info.extraInfo).lockScreenSecure
+            if (info == null || info.extraInfo == null) {
+                return false;
+            }
+            return ((AppRow) info.extraInfo).lockScreenSecure
                     && ((AppRow) info.extraInfo).appVisOverride == Notification.VISIBILITY_SECRET;
         }
     };