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

Commit 46fb9e9f authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev

parents 853a1cea a987d43b

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

+1 −0
Original line number Diff line number Diff line
@@ -1213,6 +1213,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        final WindowState curTarget = mInputMethodTarget;

        if (curTarget != null && w != null

                && curTarget.isDisplayedLw()

                && curTarget.isClosing()

                && (curTarget.mWinAnimator.mAnimLayer > w.mWinAnimator.mAnimLayer)) {

            if (DEBUG_INPUT_METHOD) Slog.v(TAG, "Current target higher, not changing");

            return windows.indexOf(curTarget) + 1;

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

+5 −1
Original line number Diff line number Diff line
@@ -1024,6 +1024,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        return mClient.asBinder().isBinderAlive();

    }



    boolean isClosing() {

        return mExiting || (mService.mClosingApps.contains(mAppToken));

    }



    @Override

    public boolean isDefaultDisplay() {

        return mDisplayContent.isDefaultDisplay;
@@ -1234,7 +1238,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
            mWasPaused = mToken.paused;

            mStringNameCache = "Window{" + Integer.toHexString(System.identityHashCode(this))

                    + " u" + UserHandle.getUserId(mSession.mUid)

                    + " " + mLastTitle + (mWasPaused ? " PAUSED}" : "}");

                    + " " + mLastTitle + (mExiting ? " EXITING}" : "}");

        }

        return mStringNameCache;

    }