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

Commit e89bebe9 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Add null checks on filters. 

Bug: 27496323
Change-Id: If8883279af11218042f420509c3a8e7b168c815f
parent 63096e96

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

+16 −4
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ public class AppStateNotificationBridge extends AppStateBaseBridge { 


        @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 @@ public class AppStateNotificationBridge extends AppStateBaseBridge { 


        @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 @@ public class AppStateNotificationBridge extends AppStateBaseBridge { 


        @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 @@ public class AppStateNotificationBridge extends AppStateBaseBridge { 


        @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 @@ public class AppStateNotificationBridge extends AppStateBaseBridge { 


        @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;

        }

    };