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

Commit 37fde0ac authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Unhide KeyguardManager locked and secure state getters 

Unhide the following methods:
  android.app.KeyguardManager.isKeyguardLocked()
  android.app.KeyguardManager.isKeyguardSecure()

Fix some javadoc typos

Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
parent 02a43d3a

api/16.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -3595,6 +3595,8 @@ package android.app { 
  public class KeyguardManager {

  public class KeyguardManager {

    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);

    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);

    method public boolean inKeyguardRestrictedInputMode();

    method public boolean inKeyguardRestrictedInputMode();

    method public boolean isKeyguardLocked();

    method public boolean isKeyguardSecure();

    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);

    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);

  }

  }































api/current.txt



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -3595,6 +3595,8 @@ package android.app {









  public class KeyguardManager {







  public class KeyguardManager {











    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);







    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);











    method public boolean inKeyguardRestrictedInputMode();







    method public boolean inKeyguardRestrictedInputMode();














    method public boolean isKeyguardLocked();














    method public boolean isKeyguardSecure();











    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);







    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);











  }







  }









































core/java/android/app/KeyguardManager.java



+4
−12




























Original line number
Original line
Diff line number
Diff line








@@ -28,7 +28,7 @@ import android.view.IOnKeyguardExitResult;









 * Class that can be used to lock and unlock the keyboard. Get an instance of this 







 * Class that can be used to lock and unlock the keyboard. Get an instance of this 











 * class by calling {@link android.content.Context#getSystemService(java.lang.String)}







 * class by calling {@link android.content.Context#getSystemService(java.lang.String)}











 * with argument {@link android.content.Context#KEYGUARD_SERVICE}. The







 * with argument {@link android.content.Context#KEYGUARD_SERVICE}. The











 * Actual class to control the keyboard locking is







 * actual class to control the keyboard locking is











 * {@link android.app.KeyguardManager.KeyguardLock}.







 * {@link android.app.KeyguardManager.KeyguardLock}.











 */







 */











public class KeyguardManager {







public class KeyguardManager {










@@ -73,7 +73,7 @@ public class KeyguardManager {





























        /**







        /**











         * Reenable the keyguard.  The keyguard will reappear if the previous







         * Reenable the keyguard.  The keyguard will reappear if the previous











         * call to {@link #disableKeyguard()} caused it it to be hidden.







         * call to {@link #disableKeyguard()} caused it to be hidden.











         *







         *











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







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











         *







         *










@@ -130,13 +130,9 @@ public class KeyguardManager {









    }







    }































    /**







    /**











     * isKeyguardLocked














     *














     * Return whether the keyguard is currently locked.







     * Return whether the keyguard is currently locked.











     *







     *











     * @return true if in keyguard is locked.







     * @return true if keyguard is locked.











     *














     * @hide














     */







     */











    public boolean isKeyguardLocked() {







    public boolean isKeyguardLocked() {











        try {







        try {









@@ -147,13 +143,9 @@ public class KeyguardManager {









    }







    }































    /**







    /**











     * isKeyguardSecure














     *














     * Return whether the keyguard requires a password to unlock.







     * Return whether the keyguard requires a password to unlock.











     *







     *











     * @return true if in keyguard is secure.







     * @return true if keyguard is secure.











     *














     * @hide














     */







     */











    public boolean isKeyguardSecure() {







    public boolean isKeyguardSecure() {











        try {







        try {