From 4d64746d6ac21d587653ac2018c9abd1071077ce Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Wed, 13 Aug 2014 21:08:41 +0000
Subject: Revert "Add new intent to prompt user for their device credential."

Move API to KeyguardManager.

Fixes bug 17006280

This reverts commit 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26.

Change-Id: I7b58bb4d9db828028c1021f17b01745c5ec2161e

Conflicts:
	core/java/android/content/Intent.java
---
 core/java/android/content/Intent.java | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'core')

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index abe4f0a..61e105b 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1419,21 +1419,6 @@ public class Intent implements Parcelable, Cloneable {
     public static final String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";
 
     /**
-     * Activity Action: Prompt the user to confirm credentials (pin, pattern or password)
-     * for the current user of the device. Launch this activity using
-     * {@link android.app.Activity#startActivityForResult(Intent, int)} and check if the
-     * result is {@link android.app.Activity#RESULT_OK} for a successful response to the
-     * challenge.<p/>
-     * This intent is handled by the system at a high priority and applications cannot intercept
-     * it.<p/>
-     * You can use {@link android.app.KeyguardManager#isKeyguardSecure()} to determine if the user will be
-     * prompted.
-     */
-    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
-    public static final String ACTION_CONFIRM_DEVICE_CREDENTIAL = "android.intent.action.CONFIRM_DEVICE_CREDENTIAL";
-
-
-    /**
      * Specify whether the package should be uninstalled for all users.
      * @hide because these should not be part of normal application flow.
      */
@@ -3192,17 +3177,11 @@ public class Intent implements Parcelable, Cloneable {
 
     /**
      * A CharSequence dialog title to provide to the user when used with a
-     * {@link #ACTION_CHOOSER} or {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.
+     * {@link #ACTION_CHOOSER}.
      */
     public static final String EXTRA_TITLE = "android.intent.extra.TITLE";
 
     /**
-     * A CharSequence description to provide to the user when used with
-     * {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.
-     */
-    public static final String EXTRA_DETAILS = "android.intent.extra.DETAILS";
-
-    /**
      * A Parcelable[] of {@link Intent} or
      * {@link android.content.pm.LabeledIntent} objects as set with
      * {@link #putExtra(String, Parcelable[])} of additional activities to place
-- 
cgit v1.1