diff options
| author | Craig Mautner <cmautner@google.com> | 2015-02-16 22:59:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-16 22:59:20 +0000 |
| commit | 2a005f6fe91eac2ac2646be17815756637ed610f (patch) | |
| tree | 64c5a5b4853e79471a4bfa50634cb6d2ecfc4b2e | |
| parent | e7e923818096a8a046ad183e932454428218c867 (diff) | |
| parent | 713abc2879c21106eb806739cfd51c2a81a9b401 (diff) | |
| download | frameworks_base-2a005f6fe91eac2ac2646be17815756637ed610f.zip frameworks_base-2a005f6fe91eac2ac2646be17815756637ed610f.tar.gz frameworks_base-2a005f6fe91eac2ac2646be17815756637ed610f.tar.bz2 | |
Merge "Prevent leaking surfaces from exiting windows"
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c80d0e1..6775dee 100644 --- 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(); |