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

Commit 7de6578f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents 554d4a57 0e60db22
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -2498,6 +2498,10 @@ public class WindowManagerService extends IWindowManager.Stub
            int attrChanges = 0;
            int flagChanges = 0;
            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;
                attrChanges = win.mAttrs.copyFrom(attrs);
            }