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

Commit 99208ae2 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Merge "Fix javadoc links to permissions" into sc-dev am: 4d67c406 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13776609

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0eeb6fdd99e463be30770ca8644c5023c1453bc
parents c376b0d9 4d67c406

core/java/android/view/WindowManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3440,7 +3440,7 @@ public interface WindowManager extends ViewManager { 
        /**

         * Specifies that the window should be considered a trusted system overlay. Trusted system

         * overlays are ignored when considering whether windows are obscured during input

         * dispatch. Requires the {@link android.Manifest.permission.INTERNAL_SYSTEM_WINDOW}

         * dispatch. Requires the {@link android.Manifest.permission#INTERNAL_SYSTEM_WINDOW}

         * permission.

         *

         * {@see android.view.MotionEvent#FLAG_WINDOW_IS_OBSCURED}
@@ -3472,7 +3472,7 @@ public interface WindowManager extends ViewManager { 
         * @see LayoutParams#setSystemApplicationOverlay(boolean)

         *

         * <p>Note: the owner of the window must hold

         * {@link android.Manifest.permission.SYSTEM_APPLICATION_OVERLAY} for this to have any

         * {@link android.Manifest.permission#SYSTEM_APPLICATION_OVERLAY} for this to have any

         * effect.

         * @hide

         */