Change name of confirm credentials method after API review

Changed from getConfirmDeviceCredentialIntent to createConfirmDeviceCredentialIntent

Fixes bug 17288988

Change-Id: Iae9a997d9ea49ce23bdbbe38ad7b0763779b8f59

3 files changed, 17 insertions, 2 deletions

diff --git a/api/current.txt b/api/current.txt
index 351a2d8..3d7bf7b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4506,8 +4506,8 @@ package android.app {
   }
 
   public class KeyguardManager {
+    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
     method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
-    method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
     method public boolean inKeyguardRestrictedInputMode();
     method public boolean isKeyguardLocked();
     method public boolean isKeyguardSecure();
diff --git a/api/removed.txt b/api/removed.txt
index 1b8aef4..1fde099 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -1,3 +1,11 @@
+package android.app {
+
+  public class KeyguardManager {
+    method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
+  }
+
+}
+
 package android.media {
 
   public class AudioFormat {
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index 50e3a10..e055237 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -56,6 +56,13 @@ public class KeyguardManager {
     public static final String EXTRA_DESCRIPTION = "android.app.extra.DESCRIPTION";
 
     /**
+     * @removed
+     */
+    public Intent getConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
+        return createConfirmDeviceCredentialIntent(title, description);
+    }
+
+    /**
      * Get an intent to prompt the user to confirm credentials (pin, pattern or password)
      * for the current user of the device. The caller is expected to launch this activity using
      * {@link android.app.Activity#startActivityForResult(Intent, int)} and check for
@@ -63,7 +70,7 @@ public class KeyguardManager {
      *
      * @return the intent for launching the activity or null if no password is required.
      **/
-    public Intent getConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
+    public Intent createConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
         if (!isKeyguardSecure()) return null;
         Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);
         intent.putExtra(EXTRA_TITLE, title);