Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
index 62c1945..0b74e31 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
@@ -323,6 +323,7 @@
// Remove the task if it is blacklisted
if (sRecentsBlacklist.contains(t.realActivity.getClassName())) {
iter.remove();
+ continue;
}
// Remove the task if it is marked as excluded, unless it is the first most task and we
@@ -332,6 +333,7 @@
isExcluded |= quietProfileIds.contains(t.userId);
if (isExcluded && (!isFirstValidTask || !includeFrontMostExcludedTask)) {
iter.remove();
+ continue;
}
isFirstValidTask = false;