am 5d8f2491: am 2a005f6f: Merge "Prevent leaking surfaces from exiting windows"

* commit '5d8f249104a1798b6c55ae1de4e5ea36a4babd53': Prevent leaking surfaces from exiting windows
2015-02-16 23:09:22 +00:00
parent 0bbacbdd2f 5d8f249104
commit c8036cdc60
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -4653,6 +4653,7 @@ public class WindowManagerService extends IWindowManager.Stub
            }

            final long origId = Binder.clearCallingIdentity();
+            wtoken.inPendingTransaction = false;
            setTokenVisibilityLocked(wtoken, null, visible, AppTransition.TRANSIT_UNSET,
                    true, wtoken.voiceInteraction);
            wtoken.updateReportedVisibilityLocked();