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

Commit 700a9506 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am cb52cb52: Fix SDK build. 

Merge commit 'cb52cb52' into kraken

* commit 'cb52cb52':
  Fix SDK build.
parents 7d70358a cb52cb52

core/java/android/app/KeyguardManager.java

+4 −4
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ public class KeyguardManager { 
         *

         * A good place to call this is from {@link android.app.Activity#onResume()}

         *

         * Note: This call has no effect while any {@link DevicePolicyManager} is enabled

         * that requires a password.

         * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager} 

         * is enabled that requires a password.

         *

         * @see #reenableKeyguard()

         */
@@ -71,8 +71,8 @@ public class KeyguardManager { 
         *

         * A good place to call this is from {@link android.app.Activity#onPause()}

         *

         * Note: This call has no effect while any {@link DevicePolicyManager} is enabled

         * that requires a password.

         * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}

         * is enabled that requires a password.

         *

         * @see #disableKeyguard()

         */