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

Commit 88400d3a authored by Craig Mautner's avatar Craig Mautner
Browse files

Add flag for displaying non-user's Windows to user. 

Created a new flag that indicates that a window should be shown
to all users. For the flag to be valid the owner of the window
must have system permissions.

Also separated system window types into those that show to all
users (e.g. StatusBar, Keyguard, ....) and those that appear only
to the owning users (e.g. Drag, ANR, TOAST, ...). Those that appear
only to their owner can override their default behavior using
the new flag (e.g. LowBattery).

Fixes bug 7211965.

Change-Id: I1fdca25d57b7b523f0c7f8bceb819af656c388d4
parent 7fd1386b

core/java/android/view/WindowManager.java

+45 −0
Original line number Diff line number Diff line
@@ -298,12 +298,14 @@ public interface WindowManager extends ViewManager { 
         * Window type: the status bar.  There can be only one status bar

         * window; it is placed at the top of the screen, and all other

         * windows are shifted down so they are below it.

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_STATUS_BAR         = FIRST_SYSTEM_WINDOW;

    

        /**

         * Window type: the search bar.  There can be only one search bar

         * window; it is placed at the top of the screen.

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_SEARCH_BAR         = FIRST_SYSTEM_WINDOW+1;
@@ -312,22 +314,26 @@ public interface WindowManager extends ViewManager { 
         * user interaction with the phone (in particular incoming calls).

         * These windows are normally placed above all applications, but behind

         * the status bar.

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_PHONE              = FIRST_SYSTEM_WINDOW+2;

    

        /**

         * Window type: system window, such as low power alert. These windows

         * are always on top of application windows.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_SYSTEM_ALERT       = FIRST_SYSTEM_WINDOW+3;

        

        /**

         * Window type: keyguard window.

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_KEYGUARD           = FIRST_SYSTEM_WINDOW+4;

        

        /**

         * Window type: transient notifications.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_TOAST              = FIRST_SYSTEM_WINDOW+5;
@@ -335,6 +341,7 @@ public interface WindowManager extends ViewManager { 
         * Window type: 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.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_SYSTEM_OVERLAY     = FIRST_SYSTEM_WINDOW+6;
@@ -342,22 +349,26 @@ public interface WindowManager extends ViewManager { 
         * Window type: priority phone UI, which needs to be displayed even if

         * the keyguard is active.  These windows must not take input

         * focus, or they will interfere with the keyguard.

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_PRIORITY_PHONE     = FIRST_SYSTEM_WINDOW+7;

        

        /**

         * Window type: panel that slides out from the status bar

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_SYSTEM_DIALOG      = FIRST_SYSTEM_WINDOW+8;

    

        /**

         * Window type: dialogs that the keyguard shows

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_KEYGUARD_DIALOG    = FIRST_SYSTEM_WINDOW+9;

        

        /**

         * Window type: internal system error windows, appear on top of

         * everything they can.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_SYSTEM_ERROR       = FIRST_SYSTEM_WINDOW+10;
@@ -365,23 +376,27 @@ public interface WindowManager extends ViewManager { 
         * Window type: internal input methods windows, which appear above

         * the normal UI.  Application windows may be resized or panned to keep

         * the input focus visible while this window is displayed.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_INPUT_METHOD       = FIRST_SYSTEM_WINDOW+11;



        /**

         * Window type: internal input methods dialog windows, which appear above

         * the current input method window.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_INPUT_METHOD_DIALOG= FIRST_SYSTEM_WINDOW+12;



        /**

         * Window type: wallpaper window, placed behind any window that wants

         * to sit on top of the wallpaper.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_WALLPAPER          = FIRST_SYSTEM_WINDOW+13;



        /**

         * Window type: panel that slides out from over the status bar

         * In multiuser systems shows on all users' windows.

         */

        public static final int TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14;
@@ -393,6 +408,8 @@ public interface WindowManager extends ViewManager { 
         * 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.

         *

         * In multiuser systems shows only on the owning user's window.

         * @hide

         */

        public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15;
@@ -400,24 +417,28 @@ public interface WindowManager extends ViewManager { 
        /**

         * 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.

         * In multiuser systems shows only on the owning user's window.

         * @hide

         */

        public static final int TYPE_DRAG               = FIRST_SYSTEM_WINDOW+16;



        /**

         * Window type: panel that slides out from under the status bar

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_STATUS_BAR_SUB_PANEL = FIRST_SYSTEM_WINDOW+17;



        /**

         * Window type: (mouse) pointer

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_POINTER = FIRST_SYSTEM_WINDOW+18;



        /**

         * Window type: Navigation bar (when distinct from status bar)

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_NAVIGATION_BAR = FIRST_SYSTEM_WINDOW+19;
@@ -425,6 +446,7 @@ public interface WindowManager extends ViewManager { 
        /**

         * Window type: The volume level overlay/dialog shown when the user

         * changes the system volume.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_VOLUME_OVERLAY = FIRST_SYSTEM_WINDOW+20;
@@ -432,6 +454,7 @@ public interface WindowManager extends ViewManager { 
        /**

         * Window type: The boot progress dialog, goes on top of everything

         * in the world.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_BOOT_PROGRESS = FIRST_SYSTEM_WINDOW+21;
@@ -439,30 +462,35 @@ public interface WindowManager extends ViewManager { 
        /**

         * Window type: Fake window to consume touch events when the navigation

         * bar is hidden.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_HIDDEN_NAV_CONSUMER = FIRST_SYSTEM_WINDOW+22;



        /**

         * Window type: Dreams (screen saver) window, just above keyguard.

         * In multiuser systems shows only on the owning user's window.

         * @hide

         */

        public static final int TYPE_DREAM = FIRST_SYSTEM_WINDOW+23;



        /**

         * Window type: Navigation bar panel (when navigation bar is distinct from status bar)

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_NAVIGATION_BAR_PANEL = FIRST_SYSTEM_WINDOW+24;



        /**

         * Window type: Behind the universe of the real windows.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_UNIVERSE_BACKGROUND = FIRST_SYSTEM_WINDOW+25;



        /**

         * Window type: Display overlay window.  Used to simulate secondary display devices.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_DISPLAY_OVERLAY = FIRST_SYSTEM_WINDOW+26;
@@ -470,10 +498,19 @@ public interface WindowManager extends ViewManager { 
        /**

         * Window type: Magnification overlay window. Used to highlight the magnified

         * portion of a display when accessibility magnification is enabled.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+27;



        /**

         * Window type: Recents. Same layer as {@link #TYPE_SYSTEM_DIALOG} but only appears on

         * one user's screen.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_RECENTS_OVERLAY = FIRST_SYSTEM_WINDOW+28;



        /**

         * End of types of system windows.

         */
@@ -879,6 +916,14 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int PRIVATE_FLAG_SET_NEEDS_MENU_KEY = 0x00000008;



        /** In a multiuser system if this flag is set and the owner is a system process then this

         * window will appear on all user screens. This overrides the default behavior of window

         * types that normally only appear on the owning user's screen. Refer to each window type

         * to determine its default behavior.

         *

         * {@hide} */

        public static final int PRIVATE_FLAG_SHOW_FOR_ALL_USERS = 0x00000010;



        /**

         * Control flags that are private to the platform.

         * @hide

core/java/android/view/WindowManagerPolicy.java

+10 −0
Original line number Diff line number Diff line
@@ -499,6 +499,16 @@ public interface WindowManagerPolicy { 
     */

    public int checkAddPermission(WindowManager.LayoutParams attrs);



    /**

     * Check permissions when adding a window.

     *

     * @param attrs The window's LayoutParams.

     *

     * @return True if the window may only be shown to the current user, false if the window can

     * be shown on all users' windows.

     */

    public boolean checkShowToOwnerOnly(WindowManager.LayoutParams attrs);



    /**

     * Sanitize the layout parameters coming from a client.  Allows the policy

     * to do things like ensure that windows of a specific type can't take

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+4 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ public class PowerUI extends SystemUI { 
            if (intent.resolveActivity(mContext.getPackageManager()) != null) {

                b.setNegativeButton(R.string.battery_low_why,

                        new DialogInterface.OnClickListener() {

                    @Override

                    public void onClick(DialogInterface dialog, int which) {

                        mContext.startActivity(intent);

                        dismissLowBatteryWarning();
@@ -216,12 +217,15 @@ public class PowerUI extends SystemUI { 


            AlertDialog d = b.create();

            d.setOnDismissListener(new DialogInterface.OnDismissListener() {

                    @Override

                    public void onDismiss(DialogInterface dialog) {

                        mLowBatteryDialog = null;

                        mBatteryLevelTextView = null;

                    }

                });

            d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

            d.getWindow().getAttributes().privateFlags |=

                    WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

            d.show();

            mLowBatteryDialog = d;

        }

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

+59 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.internal.policy.impl; 


import android.app.ActivityManager;

import android.app.ActivityManagerNative;

import android.app.IUiModeManager;

import android.app.ProgressDialog;

import android.app.SearchManager;

import android.app.UiModeManager;
@@ -101,6 +100,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS; 
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
@@ -108,6 +108,7 @@ import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; 
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;
@@ -119,6 +120,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG; 
import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY;

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

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

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

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;
@@ -1199,6 +1201,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    /** {@inheritDoc} */

    @Override

    public int checkAddPermission(WindowManager.LayoutParams attrs) {

        int type = attrs.type;
@@ -1237,6 +1240,54 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        return WindowManagerGlobal.ADD_OKAY;

    }



    @Override

    public boolean checkShowToOwnerOnly(WindowManager.LayoutParams attrs) {



        // If this switch statement is modified, modify the comment in the declarations of

        // the type in {@link WindowManager.LayoutParams} as well.

        switch (attrs.type) {

            default:

                // These are the windows that by default are shown only to the user that created

                // them. If this needs to be overridden, set

                // {@link WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS} in

                // {@link WindowManager.LayoutParams}. Note that permission

                // {@link android.Manifest.permission.INTERNAL_SYSTEM_WINDOW} is required as well.

                if ((attrs.privateFlags & PRIVATE_FLAG_SHOW_FOR_ALL_USERS) == 0) {

                    return true;

                }

                break;



            // These are the windows that by default are shown to all users. However, to

            // protect against spoofing, check permissions below.

            case TYPE_APPLICATION_STARTING:

            case TYPE_BOOT_PROGRESS:

            case TYPE_DISPLAY_OVERLAY:

            case TYPE_HIDDEN_NAV_CONSUMER:

            case TYPE_KEYGUARD:

            case TYPE_KEYGUARD_DIALOG:

            case TYPE_MAGNIFICATION_OVERLAY:

            case TYPE_NAVIGATION_BAR:

            case TYPE_NAVIGATION_BAR_PANEL:

            case TYPE_PHONE:

            case TYPE_POINTER:

            case TYPE_PRIORITY_PHONE:

            case TYPE_RECENTS_OVERLAY:

            case TYPE_SEARCH_BAR:

            case TYPE_STATUS_BAR:

            case TYPE_STATUS_BAR_PANEL:

            case TYPE_STATUS_BAR_SUB_PANEL:

            case TYPE_SYSTEM_DIALOG:

            case TYPE_UNIVERSE_BACKGROUND:

            case TYPE_VOLUME_OVERLAY:

                break;

        }



        // Check if third party app has set window to system window type.

        return mContext.checkCallingOrSelfPermission(

                android.Manifest.permission.INTERNAL_SYSTEM_WINDOW)

                        != PackageManager.PERMISSION_GRANTED;

    }



    public void adjustWindowParamsLw(WindowManager.LayoutParams attrs) {

        switch (attrs.type) {

            case TYPE_SYSTEM_OVERLAY:
@@ -1355,6 +1406,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            return DISPLAY_OVERLAY_LAYER;

        case TYPE_MAGNIFICATION_OVERLAY:

            return MAGNIFICATION_OVERLAY_LAYER;

        case TYPE_RECENTS_OVERLAY:

            return SYSTEM_DIALOG_LAYER;

        }

        Log.e(TAG, "Unknown window type: " + type);

        return APPLICATION_LAYER;
@@ -1510,6 +1563,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    com.android.internal.R.styleable.Window_windowAnimationStyle, 0);

            params.privateFlags |=

                    WindowManager.LayoutParams.PRIVATE_FLAG_FAKE_HARDWARE_ACCELERATED;

            params.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

            params.setTitle("Starting " + packageName);



            WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class RecentApplicationsDialog extends Dialog implements OnClickListener 


        Window window = getWindow();

        window.requestFeature(Window.FEATURE_NO_TITLE);

        window.setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);

        window.setType(WindowManager.LayoutParams.TYPE_RECENTS_OVERLAY);

        window.setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,

                WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);

        window.setTitle("Recents");