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

Commit e8349276 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev am: abe26c8d am: 1f1fd18f 

am: 4c349870

* commit '4c349870':
  PIP: Fix NPE when onboarding is shown

Change-Id: I32e4c158876beaf98001448f250d7f6d4360018d
parents 0de064d9 4c349870

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

+2 −0
Original line number Diff line number Diff line
@@ -324,6 +324,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
@@ -333,6 +334,7 @@ public class SystemServicesProxy { 
            isExcluded |= quietProfileIds.contains(t.userId);

            if (isExcluded && (!isFirstValidTask || !includeFrontMostExcludedTask)) {

                iter.remove();

                continue;

            }



            isFirstValidTask = false;