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

Commit c4c450c3 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 47c38f00: am 558947c9: Issue #2335763: Cant dial emergency number on my device 

Merge commit '47c38f00'

* commit '47c38f00':
  Issue #2335763: Cant dial emergency number on my device
parents e8bae73b 47c38f00

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

+12 −0
Original line number Diff line number Diff line
@@ -2376,6 +2376,18 @@ public class WindowManagerService extends IWindowManager.Stub 
                    mInputMethodWindow = win;

                    imMayMove = true;

                }

                if (win.mAttrs.type == TYPE_BASE_APPLICATION

                        && win.mAppToken != null

                        && win.mAppToken.startingWindow != null) {

                    // Special handling of starting window over the base

                    // window of the app: propagate lock screen flags to it,

                    // to provide the correct semantics while starting.

                    final int mask =

                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED

                        | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;

                    WindowManager.LayoutParams sa = win.mAppToken.startingWindow.mAttrs;

                    sa.flags = (sa.flags&~mask) | (win.mAttrs.flags&mask);

                }

            } else {

                win.mEnterAnimationPending = false;

                if (win.mSurface != null) {