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

am: abe26c8d69

* commit 'abe26c8d69d7bfa5400e52ad4bb96020df0cdf68':
  PIP: Fix NPE when onboarding is shown

Change-Id: I53f212597a04444fd544342adb9ee60f281fffee
This commit is contained in:
Jaewan Kim
2016-05-13 17:00:15 +00:00
committed by android-build-merger

View File

@@ -323,6 +323,7 @@ public class SystemServicesProxy {
// 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 @@ public class SystemServicesProxy {
isExcluded |= quietProfileIds.contains(t.userId);
if (isExcluded && (!isFirstValidTask || !includeFrontMostExcludedTask)) {
iter.remove();
continue;
}
isFirstValidTask = false;