commit c8036cdc602a35a415fd66370c7621bb957f657e
author Craig Mautner <cmautner@google.com> Mon Feb 16 23:09:22 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 16 23:09:22 2015 +0000
tree 1adb810aff00485686fc83150611a3646232eb4c
parent 0bbacbdd2f3d7711fb9bbcb2852ff62fd497d731
parent 5d8f249104a1798b6c55ae1de4e5ea36a4babd53

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

* commit '5d8f249104a1798b6c55ae1de4e5ea36a4babd53':
  Prevent leaking surfaces from exiting windows

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 2ace842..4dd4e1e 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -4653,6 +4653,7 @@
             }
 
             final long origId = Binder.clearCallingIdentity();
+            wtoken.inPendingTransaction = false;
             setTokenVisibilityLocked(wtoken, null, visible, AppTransition.TRANSIT_UNSET,
                     true, wtoken.voiceInteraction);
             wtoken.updateReportedVisibilityLocked();