From 37fde0aca01fcfcd8483df70a4e82f622e15fda2 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 24 May 2012 17:13:06 -0700
Subject: [PATCH] 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
---
 api/16.txt                                 |  2 ++
 api/current.txt                            |  2 ++
 core/java/android/app/KeyguardManager.java | 16 ++++------------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/api/16.txt b/api/16.txt
index 7e9794f01150a..b8aeb392ae834 100644
--- a/api/16.txt
+++ b/api/16.txt
@@ -3595,6 +3595,8 @@ package android.app {
   public class KeyguardManager {
     method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
     method public boolean inKeyguardRestrictedInputMode();
+    method public boolean isKeyguardLocked();
+    method public boolean isKeyguardSecure();
     method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);
   }
 
diff --git a/api/current.txt b/api/current.txt
index 7e9794f01150a..b8aeb392ae834 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3595,6 +3595,8 @@ package android.app {
   public class KeyguardManager {
     method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
     method public boolean inKeyguardRestrictedInputMode();
+    method public boolean isKeyguardLocked();
+    method public boolean isKeyguardSecure();
     method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);
   }
 
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index 0fe7b5c3b0ebb..a79a8fc939fe9 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -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 by calling {@link android.content.Context#getSystemService(java.lang.String)}
  * 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}.
  */
 public class KeyguardManager {
@@ -73,7 +73,7 @@ public class KeyguardManager {
 
         /**
          * 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()}
          *
@@ -130,13 +130,9 @@ public class KeyguardManager {
     }
 
     /**
-     * isKeyguardLocked
-     *
      * Return whether the keyguard is currently locked.
      *
-     * @return true if in keyguard is locked.
-     *
-     * @hide
+     * @return true if keyguard is locked.
      */
     public boolean isKeyguardLocked() {
         try {
@@ -147,13 +143,9 @@ public class KeyguardManager {
     }
 
     /**
-     * isKeyguardSecure
-     *
      * Return whether the keyguard requires a password to unlock.
      *
-     * @return true if in keyguard is secure.
-     *
-     * @hide
+     * @return true if keyguard is secure.
      */
     public boolean isKeyguardSecure() {
         try {