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

Commit bd8a4b03 authored by Jason Monk's avatar Jason Monk
Browse files

Check QS window token types 

Change-Id: Id72193b680a9a1bf2a353ed8f902057ace3dde20
parent 9445345e

services/core/java/com/android/server/wm/WindowManagerService.java

+7 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ import android.view.WindowManagerPolicy.PointerEventListener; 
import android.view.animation.Animation;

import android.view.inputmethod.InputMethodManagerInternal;

import android.widget.Toast;



import com.android.internal.R;

import com.android.internal.app.IAssistScreenshotReceiver;

import com.android.internal.os.IResultReceiver;
@@ -220,8 +219,8 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY; 
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER_LIGHT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_TRACE;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_STACK_CRAWLS;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_STACK_CRAWLS;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_SURFACE_ALLOC;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_VERBOSE_TRANSACTIONS;
@@ -1892,6 +1891,12 @@ public class WindowManagerService extends IWindowManager.Stub 
                            + attrs.token + ".  Aborting.");

                    return WindowManagerGlobal.ADD_BAD_APP_TOKEN;

                }

            } else if (type == TYPE_QS_DIALOG) {

                if (token.windowType != TYPE_QS_DIALOG) {

                    Slog.w(TAG_WM, "Attempted to add QS dialog window with bad token "

                            + attrs.token + ".  Aborting.");

                    return WindowManagerGlobal.ADD_BAD_APP_TOKEN;

                }

            } else if (token.appWindowToken != null) {

                Slog.w(TAG_WM, "Non-null appWindowToken for system window of type=" + type);

                // It is not valid to use an app token with other system types; we will