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

Commit 11a99404 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev 

am: 39608b85

Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29
parents 56fa529c 39608b85

core/java/android/view/WindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -978,8 +978,9 @@ public interface WindowManager extends ViewManager { 
         * seeing this window, unless {@link #FLAG_SHOW_WHEN_LOCKED} has

         * also been set.

         * @deprecated Use {@link #FLAG_SHOW_WHEN_LOCKED} or {@link KeyguardManager#dismissKeyguard}

         * instead. The Keyguard should never be dismissed automatically repeatedly as it also

         * guards against unintentional touches.

         * instead. Since keyguard was dismissed all the time as long as an activity with this flag

         * on its window was focused, keyguard couldn't guard against unintentional touches on the

         * screen, which isn't desired.

         */

        @Deprecated

        public static final int FLAG_DISMISS_KEYGUARD = 0x00400000;