diff options
5 files changed, 7 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index e914cd4e7e36..a210223dc079 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -281,7 +281,7 @@ class AppWindowToken extends WindowToken { Slog.w(WindowManagerService.TAG, "removeAllWindows: removing win=" + win); } - service.removeWindowLocked(win.mSession, win); + service.removeWindowLocked(win); } allAppWindows.clear(); windows.clear(); diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index bb535342d0ad..c24fcb3e7501 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -78,7 +78,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { WindowState windowState = (WindowState) inputWindowHandle.windowState; if (windowState != null) { Slog.i(WindowManagerService.TAG, "WINDOW DIED " + windowState); - mService.removeWindowLocked(windowState.mSession, windowState); + mService.removeWindowLocked(windowState); } } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 38fc95957291..c5bdbb03e229 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2660,11 +2660,11 @@ public class WindowManagerService extends IWindowManager.Stub if (win == null) { return; } - removeWindowLocked(session, win); + removeWindowLocked(win); } } - public void removeWindowLocked(Session session, WindowState win) { + void removeWindowLocked(WindowState win) { if (win.mAttrs.type == TYPE_APPLICATION_STARTING) { if (DEBUG_STARTING_WINDOW) Slog.d(TAG, "Starting window removed " + win); } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index cd9689e46aa1..ec708797f0e6 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1169,10 +1169,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { WindowState win = mService.windowForClientLocked(mSession, mClient, false); Slog.i(TAG, "WIN DEATH: " + win); if (win != null) { - mService.removeWindowLocked(mSession, win); + mService.removeWindowLocked(win); } else if (mHasSurface) { Slog.e(TAG, "!!! LEAK !!! Window removed but surface still valid."); - mService.removeWindowLocked(mSession, WindowState.this); + mService.removeWindowLocked(WindowState.this); } } } catch (IllegalArgumentException ex) { diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index bbeee8ca7566..b303505ca92a 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -83,7 +83,7 @@ class WindowToken { WindowState win = windows.get(winNdx); if (WindowManagerService.DEBUG_WINDOW_MOVEMENT) Slog.w(WindowManagerService.TAG, "removeAllWindows: removing win=" + win); - win.mService.removeWindowLocked(win.mSession, win); + win.mService.removeWindowLocked(win); } windows.clear(); } |