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

Commit 3b2b354e authored by Jeff Brown's avatar Jeff Brown
Browse files

Add support for secure system overlays. 

Manual merge from Gingerbread.

This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.

Bug: 3098519
Change-Id: Id876736fd8bf332ff9a5428bde59f5268aa49c3a
parent 1edb2bda

core/java/android/view/WindowManager.java

+16 −3
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ public interface WindowManager extends ViewManager { 
            @ViewDebug.IntToString(from = TYPE_KEYGUARD_DIALOG, to = "TYPE_KEYGUARD_DIALOG"),

            @ViewDebug.IntToString(from = TYPE_SYSTEM_ERROR, to = "TYPE_SYSTEM_ERROR"),

            @ViewDebug.IntToString(from = TYPE_INPUT_METHOD, to = "TYPE_INPUT_METHOD"),

            @ViewDebug.IntToString(from = TYPE_INPUT_METHOD_DIALOG, to = "TYPE_INPUT_METHOD_DIALOG")

            @ViewDebug.IntToString(from = TYPE_INPUT_METHOD_DIALOG, to = "TYPE_INPUT_METHOD_DIALOG"),

            @ViewDebug.IntToString(from = TYPE_SECURE_SYSTEM_OVERLAY, to = "TYPE_SECURE_SYSTEM_OVERLAY")

        })

        public int type;
@@ -346,12 +347,24 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14;



        /**

         * Window type: secure system overlay windows, which need to be displayed

         * on top of everything else.  These windows must not take input

         * focus, or they will interfere with the keyguard.

         *

         * This is exactly like {@link #TYPE_SYSTEM_OVERLAY} except that only the

         * system itself is allowed to create these overlays.  Applications cannot

         * obtain permission to create secure system overlays.

         * @hide

         */

        public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15;



        /**

         * Window type: the drag-and-drop pseudowindow.  There is only one

         * drag layer (at most), and it is placed on top of all other windows.

         * @hide

         */

        public static final int TYPE_DRAG               = FIRST_SYSTEM_WINDOW+15;

        public static final int TYPE_DRAG               = FIRST_SYSTEM_WINDOW+16;



        /**

         * End of types of system windows.

include/ui/InputDispatcher.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ struct InputWindow { 
        TYPE_INPUT_METHOD_DIALOG= FIRST_SYSTEM_WINDOW+12,

        TYPE_WALLPAPER          = FIRST_SYSTEM_WINDOW+13,

        TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14,

        TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15,

        LAST_SYSTEM_WINDOW      = 2999,

    };

libs/ui/InputDispatcher.cpp

+3 −2
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ bool InputWindow::frameContainsPoint(int32_t x, int32_t y) const { 


bool InputWindow::isTrustedOverlay() const {

    return layoutParamsType == TYPE_INPUT_METHOD

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG;

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG

            || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY;

}
@@ -1350,7 +1351,7 @@ void InputDispatcher::addMonitoringTargetsLocked() { 
        target.flags = 0;

        target.xOffset = 0;

        target.yOffset = 0;

        target.windowType = InputWindow::TYPE_SYSTEM_OVERLAY;

        target.windowType = -1;

    }

}

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+6 −1
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG; 
import static android.view.WindowManager.LayoutParams.TYPE_PHONE;

import static android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE;

import static android.view.WindowManager.LayoutParams.TYPE_SEARCH_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
@@ -163,6 +164,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    static final int DRAG_LAYER = 16;

    // things in here CAN NOT take focus, but are shown on top of everything else.

    static final int SYSTEM_OVERLAY_LAYER = 17;

    static final int SECURE_SYSTEM_OVERLAY_LAYER = 18;



    static final int APPLICATION_MEDIA_SUBLAYER = -2;

    static final int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1;
@@ -691,7 +693,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                    WindowManager.LayoutParams.MATCH_PARENT,

                    WindowManager.LayoutParams.MATCH_PARENT);

            lp.type = WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY;

            lp.type = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY;

            lp.flags = 

                WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE|

                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE|
@@ -787,6 +789,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    public void adjustWindowParamsLw(WindowManager.LayoutParams attrs) {

        switch (attrs.type) {

            case TYPE_SYSTEM_OVERLAY:

            case TYPE_SECURE_SYSTEM_OVERLAY:

            case TYPE_TOAST:

                // These types of windows can't receive input events.

                attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
@@ -864,6 +867,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            return INPUT_METHOD_DIALOG_LAYER;

        case TYPE_SYSTEM_OVERLAY:

            return SYSTEM_OVERLAY_LAYER;

        case TYPE_SECURE_SYSTEM_OVERLAY:

            return SECURE_SYSTEM_OVERLAY_LAYER;

        case TYPE_PRIORITY_PHONE:

            return PRIORITY_PHONE_LAYER;

        case TYPE_TOAST:

services/java/com/android/server/LoadAverageService.java

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public class LoadAverageService extends Service { 
        WindowManager.LayoutParams params = new WindowManager.LayoutParams(

            WindowManager.LayoutParams.WRAP_CONTENT,

            WindowManager.LayoutParams.WRAP_CONTENT,

            WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY,

            WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY,

            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE|

            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,

            PixelFormat.TRANSLUCENT);