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

Commit cdd5fe98 authored by Jay Civelli's avatar Jay Civelli
Browse files

Revert "Add new intent to prompt user for their device credential. DO NOT MERGE" 

Breaks the JavaDoc generation.

This reverts commit c82a11573810ed4d1f40568d19afc27f726829af.

Change-Id: I9e38a0d6ba0935d4967b50023030c99727bfc839
parent 4883a5ab

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -7594,7 +7594,6 @@ package android.content { 
    field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER";

    field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";

    field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED";

    field public static final java.lang.String ACTION_CONFIRM_DEVICE_CREDENTIAL = "android.intent.action.CONFIRM_DEVICE_CREDENTIAL";

    field public static final java.lang.String ACTION_CREATE_DOCUMENT = "android.intent.action.CREATE_DOCUMENT";

    field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";

    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";
@@ -7737,7 +7736,6 @@ package android.content { 
    field public static final java.lang.String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";

    field public static final java.lang.String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list";

    field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";

    field public static final java.lang.String EXTRA_DETAILS = "android.intent.extra.DETAILS";

    field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";

    field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2

    field public static final int EXTRA_DOCK_STATE_DESK = 1; // 0x1

core/java/android/content/Intent.java

+1 −22
Original line number Diff line number Diff line
@@ -1414,21 +1414,6 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    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 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.
@@ -3177,16 +3162,10 @@ 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 show to the user on the lock screen UI asking for

     * their credentials 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