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

Commit 04897a9b authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE" into qt-dev

parents 4abf1620 a9211d68

core/java/android/app/Presentation.java

+7 −9
Original line number Diff line number Diff line
@@ -26,18 +26,18 @@ import android.content.res.Resources; 
import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager.DisplayListener;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.Gravity;

import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManagerImpl;

import android.os.Handler;

import android.os.Message;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;



/**

 * Base class for presentations.
@@ -116,9 +116,7 @@ import android.view.WindowManagerImpl; 
 * The display manager keeps track of all displays in the system.  However, not all

 * displays are appropriate for showing presentations.  For example, if an activity

 * attempted to show a presentation on the main display it might obscure its own content

 * (it's like opening a dialog on top of your activity).  Creating a presentation on the main

 * display will result in {@link android.view.WindowManager.InvalidDisplayException} being thrown

 * when invoking {@link #show()}.

 * (it's like opening a dialog on top of your activity).

 * </p><p>

 * Here's how to identify suitable displays for showing presentations using

 * {@link DisplayManager#getDisplays(String)} and the
@@ -245,7 +243,7 @@ public class Presentation extends Dialog { 
    /**

     * Inherited from {@link Dialog#show}. Will throw

     * {@link android.view.WindowManager.InvalidDisplayException} if the specified secondary

     * {@link Display} can't be found or if it does not have {@link Display#FLAG_PRESENTATION} set.

     * {@link Display} can't be found.

     */

    @Override

    public void show() {

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

+0 −8
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_DREAM; 
import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;
@@ -1277,13 +1276,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                return WindowManagerGlobal.ADD_PERMISSION_DENIED;

            }



            if (type == TYPE_PRESENTATION && !displayContent.getDisplay().isPublicPresentation()) {

                Slog.w(TAG_WM,

                        "Attempted to add presentation window to a non-suitable display.  "

                                + "Aborting.");

                return WindowManagerGlobal.ADD_INVALID_DISPLAY;

            }



            AppWindowToken atoken = null;

            final boolean hasParent = parentWindow != null;

            // Use existing parent window token for child windows since they go in the same token