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

Commit 1f1fd18f 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

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

Change-Id: I53f212597a04444fd544342adb9ee60f281fffee
parents 9f768c34 abe26c8d

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

+2 −0
Original line number Diff line number Diff line
@@ -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;