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

Commit 1ea6afe1 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev

parents d15b54d2 74bf065e

core/java/android/view/ViewRootImpl.java

+19 −15
Original line number Diff line number Diff line
@@ -590,6 +590,10 @@ public final class ViewRootImpl implements ViewParent, 
                            throw new WindowManager.InvalidDisplayException(

                                    "Unable to add window " + mWindow +

                                    " -- the specified display can not be found");

                        case WindowManagerGlobal.ADD_INVALID_TYPE:

                            throw new WindowManager.InvalidDisplayException(

                                    "Unable to add window " + mWindow

                                    + " -- the specified window type is not valid");

                    }

                    throw new RuntimeException(

                            "Unable to add window -- unknown error code " + res);

core/java/android/view/WindowManagerGlobal.java

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ public final class WindowManagerGlobal { 
    public static final int ADD_MULTIPLE_SINGLETON = -7;

    public static final int ADD_PERMISSION_DENIED = -8;

    public static final int ADD_INVALID_DISPLAY = -9;

    public static final int ADD_INVALID_TYPE = -10;



    private static WindowManagerGlobal sDefaultWindowManager;

    private static IWindowManager sWindowManagerService;

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

+8 −2
Original line number Diff line number Diff line
@@ -1641,8 +1641,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


        outAppOp[0] = AppOpsManager.OP_NONE;



        if (type < WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW

                || type > WindowManager.LayoutParams.LAST_SYSTEM_WINDOW) {

        if (!((type >= FIRST_APPLICATION_WINDOW && type <= LAST_APPLICATION_WINDOW)

                || (type >= FIRST_SUB_WINDOW && type <= LAST_SUB_WINDOW)

                || (type >= FIRST_SYSTEM_WINDOW && type <= LAST_SYSTEM_WINDOW))) {

            return WindowManagerGlobal.ADD_INVALID_TYPE;

        }



        if (type < FIRST_SYSTEM_WINDOW || type > LAST_SYSTEM_WINDOW) {

            // Window manager will make sure these are okay.

            return WindowManagerGlobal.ADD_OKAY;

        }

        String permission = null;