PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null checks on filters. am: e89bebe

Browse Source 
am: e723b0f

* commit 'e723b0f0f77e02503a99895def4634508bf852a6':
  Add null checks on filters.

Change-Id: I0fcc68f270b51680452dc8041111a1d6225d8a8d
This commit is contained in:
Julia Reynolds
2016-04-01 14:06:48 +00:00
committed by android-build-merger
parent 8505258c31 e723b0f0f7
commit e606fd8a5e
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/applications/AppStateNotificationBridge.java
View File

@@ -70,6 +70,9 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
@Override @Override
public boolean filterApp(AppEntry info) { public boolean filterApp(AppEntry info) {
if (info == null || info.extraInfo == null) {
return false;
}
if (info.extraInfo instanceof AppRow) { if (info.extraInfo instanceof AppRow) {
AppRow row = (AppRow) info.extraInfo; AppRow row = (AppRow) info.extraInfo;
return row.banned; return row.banned;
@@ -85,7 +88,7 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
@Override @Override
public boolean filterApp(AppEntry info) { public boolean filterApp(AppEntry info) {
if (info == null) { if (info == null || info.extraInfo == null) {
return false; return false;
} }
AppRow row = (AppRow) info.extraInfo; AppRow row = (AppRow) info.extraInfo;
@@ -101,7 +104,10 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
@Override @Override
public boolean filterApp(AppEntry info) { 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 @Override
public boolean filterApp(AppEntry info) { 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; && ((AppRow) info.extraInfo).appVisOverride == Notification.VISIBILITY_PRIVATE;
} }
}; };
@@ -124,7 +133,10 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
@Override @Override
public boolean filterApp(AppEntry info) { 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; && ((AppRow) info.extraInfo).appVisOverride == Notification.VISIBILITY_SECRET;
} }
}; };