Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410'

* commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410':
  Issue #2335763: Cant dial emergency number on my device
This commit is contained in:
Dianne Hackborn
2009-12-18 16:14:34 -08:00
committed by Android Git Automerger
parent e8bae73b8c 47c38f00ab
commit c4c450c379
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/WindowManagerService.java
View File

@@ -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) {