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

Merge "Fix window disappearing when docking a second app"

Browse Source
This commit is contained in:
Chong Zhang
2015-12-04 00:06:38 +00:00
committed by Android (Google) Code Review
parent 9e50b788a5 48a87a5426
commit e920098f31
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/Task.java
View File

@@ -252,7 +252,7 @@ class Task implements DimLayer.DimLayerUser {
}
int boundsChange = BOUNDS_CHANGE_NONE;
if (mBounds.left != bounds.left || mBounds.right != bounds.right) {
if (mBounds.left != bounds.left || mBounds.top != bounds.top) {
boundsChange |= BOUNDS_CHANGE_POSITION;
}
if (mBounds.width() != bounds.width() || mBounds.height() != bounds.height()) {

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -10195,7 +10195,7 @@ public class WindowManagerService extends IWindowManager.Stub
public void setReplacingWindow(IBinder token, boolean animate) {
synchronized (mWindowMap) {
AppWindowToken appWindowToken = findAppWindowToken(token);
if (appWindowToken == null) {
if (appWindowToken == null || !appWindowToken.isVisible()) {
Slog.w(TAG, "Attempted to set replacing window on non-existing app token " + token);
return;
}