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

Merge "Fix issue #4974633: Block the HOME button using TYPE_KEYGUARD"

Browse Source
This commit is contained in:
Dianne Hackborn
2011-09-01 15:56:36 -07:00
committed by Android (Google) Code Review
parent 554d4a5765 0e60db221c
commit 7de6578f1c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2498,6 +2498,10 @@ public class WindowManagerService extends IWindowManager.Stub
int attrChanges = 0; int attrChanges = 0;
int flagChanges = 0; int flagChanges = 0;
if (attrs != null) { if (attrs != null) {
if (win.mAttrs.type != attrs.type) {
throw new IllegalArgumentException(
"Window type can not be changed after the window is added.");
}
flagChanges = win.mAttrs.flags ^= attrs.flags; flagChanges = win.mAttrs.flags ^= attrs.flags;
attrChanges = win.mAttrs.copyFrom(attrs); attrChanges = win.mAttrs.copyFrom(attrs);
} }