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

Commit 4ce6754e authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge "Always send task stack change updates if PiP is enabled" into nyc-mr1-dev

parents fc20505e 8290f8f6

packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ public class PipManager { 
    private static boolean isSettingsShown(ComponentName topActivity) {

        for (Pair<String, String> componentName : sSettingsPackageAndClassNamePairList) {

            String packageName = componentName.first;

            if (topActivity.getPackageName().equals(componentName.first)) {

            if (topActivity.getPackageName().equals(packageName)) {

                String className = componentName.second;

                if (className == null || topActivity.getClassName().equals(className)) {

                    return true;

services/core/java/com/android/server/am/ActivityStack.java

+5 −2
Original line number Diff line number Diff line
@@ -1350,8 +1350,11 @@ final class ActivityStack { 
            prev.cpuTimeAtResume = 0; // reset it

        }



        // Notify when the task stack has changed, but only if visibilities changed (not just focus)

        if (mStackSupervisor.mAppVisibilitiesChangedSinceLastPause) {

        // Notify when the task stack has changed, but only if visibilities changed (not just

        // focus). Also if there is an active pinned stack - we always want to notify it about

        // task stack changes, because its positioning may depend on it.

        if (mStackSupervisor.mAppVisibilitiesChangedSinceLastPause

                || mService.mStackSupervisor.getStack(PINNED_STACK_ID) != null) {

            mService.notifyTaskStackChangedLocked();

            mStackSupervisor.mAppVisibilitiesChangedSinceLastPause = false;

        }