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

Commit 804101b8 authored by Max Bires's avatar Max Bires Committed by Automerger Merge Worker
Browse files

Merge "Revert "Deprecate uses of Android Protected Confirmation"" into main am: 8089347d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3093804



Change-Id: I9272341fb787ac2ae2c2e377558989d9e5037e28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f10a0a6 8089347d

keystore/java/android/security/AndroidProtectedConfirmation.java

+0 −15
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ public class AndroidProtectedConfirmation { 


    /**

     * Requests keystore call into the confirmationui HAL to display a prompt.

     * @deprecated Android Protected Confirmation had a low adoption rate among Android device

     *             makers and developers alike. Given the lack of devices supporting the

     *             feature, it is deprecated. Developers can use auth-bound Keystore keys

     *             as a partial replacement.

     *

     * @param listener the binder to use for callbacks.

     * @param promptText the prompt to display.
@@ -72,7 +68,6 @@ public class AndroidProtectedConfirmation { 
     * @return one of the {@code CONFIRMATIONUI_*} constants, for

     * example {@code KeyStore.CONFIRMATIONUI_OK}.

     */

    @Deprecated

    public int presentConfirmationPrompt(IConfirmationCallback listener, String promptText,

                                         byte[] extraData, String locale, int uiOptionsAsFlags) {

        try {
@@ -89,16 +84,11 @@ public class AndroidProtectedConfirmation { 


    /**

     * Requests keystore call into the confirmationui HAL to cancel displaying a prompt.

     * @deprecated Android Protected Confirmation had a low adoption rate among Android device

     *             makers and developers alike. Given the lack of devices supporting the

     *             feature, it is deprecated. Developers can use auth-bound Keystore keys

     *             as a partial replacement.

     *

     * @param listener the binder passed to the {@link #presentConfirmationPrompt} method.

     * @return one of the {@code CONFIRMATIONUI_*} constants, for

     * example {@code KeyStore.CONFIRMATIONUI_OK}.

     */

    @Deprecated

    public int cancelConfirmationPrompt(IConfirmationCallback listener) {

        try {

            getService().cancelPrompt(listener);
@@ -113,14 +103,9 @@ public class AndroidProtectedConfirmation { 


    /**

     * Requests keystore to check if the confirmationui HAL is available.

     * @deprecated Android Protected Confirmation had a low adoption rate among Android device

     *             makers and developers alike. Given the lack of devices supporting the

     *             feature, it is deprecated. Developers can use auth-bound Keystore keys

     *             as a partial replacement.

     *

     * @return whether the confirmationUI HAL is available.

     */

    @Deprecated

    public boolean isConfirmationPromptSupported() {

        try {

            return getService().isSupported();