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

Commit 8071f527 authored by Arpan Kaphle's avatar Arpan Kaphle Committed by Automerger Merge Worker
Browse files

Merge "Finalizing V2 Bugs - Removing TODOs" into udc-dev am: 761cab9a 

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



Change-Id: I6067918ef22bf95072918b94421a5be2354e82b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d568d1ba 761cab9a

services/credentials/java/com/android/server/credentials/ClearRequestSession.java

+0 −2
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ public final class ClearRequestSession extends RequestSession<ClearCredentialSta 
    private void respondToClientWithResponseAndFinish() {

        Log.i(TAG, "respondToClientWithResponseAndFinish");

        if (isSessionCancelled()) {

            // TODO: Differentiate btw cancelled and false

            mChosenProviderMetric.setChosenProviderStatus(

                    MetricUtilities.METRICS_PROVIDER_STATUS_FINAL_SUCCESS);

            logApiCall(ApiName.CLEAR_CREDENTIAL, /* apiStatus */
@@ -144,7 +143,6 @@ public final class ClearRequestSession extends RequestSession<ClearCredentialSta 
    private void respondToClientWithErrorAndFinish(String errorType, String errorMsg) {

        Log.i(TAG, "respondToClientWithErrorAndFinish");

        if (isSessionCancelled()) {

            // TODO: Differentiate btw cancelled and false

            logApiCall(ApiName.CLEAR_CREDENTIAL, /* apiStatus */

                    ApiStatus.METRICS_API_STATUS_CLIENT_CANCELED);

            finishSession(/*propagateCancellation=*/true);

services/credentials/java/com/android/server/credentials/CreateRequestSession.java

+0 −2
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ public final class CreateRequestSession extends RequestSession<CreateCredentialR 
            return;

        }

        if (isSessionCancelled()) {

            // TODO: Differentiate btw cancelled and false

            logApiCall(ApiName.CREATE_CREDENTIAL, /* apiStatus */

                    ApiStatus.METRICS_API_STATUS_CLIENT_CANCELED);

            finishSession(/*propagateCancellation=*/true);
@@ -168,7 +167,6 @@ public final class CreateRequestSession extends RequestSession<CreateCredentialR 
            return;

        }

        if (isSessionCancelled()) {

            // TODO: Differentiate btw cancelled and false

            logApiCall(ApiName.CREATE_CREDENTIAL, /* apiStatus */

                    ApiStatus.METRICS_API_STATUS_CLIENT_CANCELED);

            finishSession(/*propagateCancellation=*/true);

services/credentials/java/com/android/server/credentials/GetRequestSession.java

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ public final class GetRequestSession extends RequestSession<GetCredentialRequest 
            return;

        }

        if (isSessionCancelled()) {

            // TODO: Differentiate btw cancelled and false

            logApiCall(ApiName.GET_CREDENTIAL, /* apiStatus */

                    ApiStatus.METRICS_API_STATUS_CLIENT_CANCELED);

            finishSession(/*propagateCancellation=*/true);