diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java index 30622d29b9a9..5cc2d01fc041 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java @@ -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; diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 994c3dec0aad..a10266483834 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -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; } |