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

Merge "Fix dead surface/window left on screen" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-21 17:58:50 +00:00
committed by Android (Google) Code Review
parent d67a1ca49b 3cc58ddd3c
commit 289395b1fe
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4258,7 +4258,6 @@ public class WindowManagerService extends IWindowManager.Stub
WindowManagerPolicy.TRANSIT_EXIT); WindowManagerPolicy.TRANSIT_EXIT);
} }
} }
win.mAnimatingExit = true;
changed = true; changed = true;
win.setDisplayLayoutNeeded(); win.setDisplayLayoutNeeded();
} }

3
services/core/java/com/android/server/wm/WindowSurfaceController.java
View File

@@ -100,6 +100,8 @@ class WindowSurfaceController {
void hideInTransaction(String reason) { void hideInTransaction(String reason) {
if (SHOW_TRANSACTIONS) logSurface("HIDE ( " + reason + " )", null); if (SHOW_TRANSACTIONS) logSurface("HIDE ( " + reason + " )", null);
mHiddenForOtherReasons = true; mHiddenForOtherReasons = true;
mAnimator.destroyPreservedSurfaceLocked();
updateVisibility(); updateVisibility();
} }
@@ -180,6 +182,7 @@ class WindowSurfaceController {
updateVisibility(); updateVisibility();
} else { } else {
mHiddenForCrop = true; mHiddenForCrop = true;
mAnimator.destroyPreservedSurfaceLocked();
updateVisibility(); updateVisibility();
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {