From bde3d18dd5748bd24e527c653504346ad012c2dc Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Tue, 26 Aug 2014 19:53:17 -0700
Subject: [PATCH] Change name of confirm credentials method after API review

Changed from getConfirmDeviceCredentialIntent to createConfirmDeviceCredentialIntent

Fixes bug 17288988

Change-Id: Iae9a997d9ea49ce23bdbbe38ad7b0763779b8f59
---
 api/current.txt                            | 2 +-
 api/removed.txt                            | 8 ++++++++
 core/java/android/app/KeyguardManager.java | 9 ++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 351a2d875d80c..3d7bf7b2d2886 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 1b8aef4c6f946..1fde099efee0e 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 50e3a108576fa..e0552375de5d4 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -55,6 +55,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
@@ -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);