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

Commit d1a09221 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Reland "Fixed constant window switching on lock screen..." 

This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.

Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.

Bug: 18021493
Bug: 22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
parent f62f4c94

core/java/android/view/WindowManagerPolicy.java

+4 −3
Original line number Diff line number Diff line
@@ -916,9 +916,10 @@ public interface WindowManagerPolicy { 
     *

     * @param win The window being positioned.

     * @param attrs The LayoutParams of the window.

     * @param attached For sub-windows, the window it is attached to. Otherwise null.

     */

    public void applyPostLayoutPolicyLw(WindowState win,

            WindowManager.LayoutParams attrs);

            WindowManager.LayoutParams attrs, WindowState attached);



    /**

     * Called following layout of all windows and after policy has been applied

services/core/java/com/android/server/policy/PhoneWindowManager.java

+8 −3
Original line number Diff line number Diff line
@@ -4244,7 +4244,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    /** {@inheritDoc} */

    @Override

    public void applyPostLayoutPolicyLw(WindowState win, WindowManager.LayoutParams attrs) {

    public void applyPostLayoutPolicyLw(WindowState win, WindowManager.LayoutParams attrs,

            WindowState attached) {

        if (DEBUG_LAYOUT) Slog.i(TAG, "Win " + win + ": isVisibleOrBehindKeyguardLw="

                + win.isVisibleOrBehindKeyguardLw());

        final int fl = PolicyControl.getWindowFlags(win, attrs);
@@ -4289,8 +4290,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

            }



            if (appWindow) {

            final IApplicationToken appToken = win.getAppToken();



            // For app windows that are not attached, we decide if all windows in the app they

            // represent should be hidden or if we should hide the lockscreen. For attached app

            // windows we defer the decision to the window it is attached to.

            if (appWindow && attached == null) {

                if (showWhenLocked) {

                    // Remove any previous windows with the same appToken.

                    mAppsToBeHidden.remove(appToken);

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

+1 −1
Original line number Diff line number Diff line
@@ -9937,7 +9937,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        for (i = windows.size() - 1; i >= 0; i--) {

                            WindowState w = windows.get(i);

                            if (w.mHasSurface) {

                                mPolicy.applyPostLayoutPolicyLw(w, w.mAttrs);

                                mPolicy.applyPostLayoutPolicyLw(w, w.mAttrs, w.mAttachedWindow);

                            }

                        }

                        displayContent.pendingLayoutChanges |= mPolicy.finishPostLayoutPolicyLw();