Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10cb2243 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Cleaned-up unused session argument."

parents e79449ae a6ab5c4e

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

+1 −1
Original line number Diff line number Diff line
@@ -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();

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -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) {

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

+1 −1
Original line number Diff line number Diff line
@@ -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();

    }