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

* commit '2a005f6fe91eac2ac2646be17815756637ed610f': Prevent leaking surfaces from exiting windows
2015-02-16 23:04:08 +00:00
parent 58524b2aa6 2a005f6fe9
commit 5d8f249104
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
@@ -4600,6 +4600,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();