Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-13 16:55:11 +00:00
committed by Android (Google) Code Review
parent 3264b60738 91c5066c00
commit abe26c8d69
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
View File

@@ -323,6 +323,7 @@ public class SystemServicesProxy {
// Remove the task if it is blacklisted // Remove the task if it is blacklisted
if (sRecentsBlacklist.contains(t.realActivity.getClassName())) { if (sRecentsBlacklist.contains(t.realActivity.getClassName())) {
iter.remove(); iter.remove();
continue;
} }
// Remove the task if it is marked as excluded, unless it is the first most task and we // Remove the task if it is marked as excluded, unless it is the first most task and we
@@ -332,6 +333,7 @@ public class SystemServicesProxy {
isExcluded |= quietProfileIds.contains(t.userId); isExcluded |= quietProfileIds.contains(t.userId);
if (isExcluded && (!isFirstValidTask || !includeFrontMostExcludedTask)) { if (isExcluded && (!isFirstValidTask || !includeFrontMostExcludedTask)) {
iter.remove(); iter.remove();
continue;
} }
isFirstValidTask = false; isFirstValidTask = false;