Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge \"Always send task stack change updates if PiP is enabled\" into nyc-mr1-dev am: 4ce6754e60" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-07-01 22:00:50 +00:00
committed by Android (Google) Code Review
parent 29344e7ef5 aa6f37b2b0
commit 839b926825
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

7
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -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;
}