From becd35d55af5f9643782f67468fbe2316f892d61 Mon Sep 17 00:00:00 2001
From: Arpan Kaphle <akaphle@google.com>
Date: Mon, 6 Mar 2023 18:51:42 +0000
Subject: [PATCH] Finalizing V2 Bugs - Removing TODOs

After speaking with team, understood the context behind this TODO and
realized earlier changes made had fixed it. Removing them to then close
out the bug.

Bug: 269290341
Test: Builds, TODO change
Change-Id: I089e66b5617b09188d8b58f26c0c1a3a5a6e1edf
---
 .../com/android/server/credentials/ClearRequestSession.java     | 2 --
 .../com/android/server/credentials/CreateRequestSession.java    | 2 --
 .../java/com/android/server/credentials/GetRequestSession.java  | 1 -
 3 files changed, 5 deletions(-)

diff --git a/services/credentials/java/com/android/server/credentials/ClearRequestSession.java b/services/credentials/java/com/android/server/credentials/ClearRequestSession.java
index 6bf18c27ee05b..c8ec7c20650b6 100644
--- a/services/credentials/java/com/android/server/credentials/ClearRequestSession.java
+++ b/services/credentials/java/com/android/server/credentials/ClearRequestSession.java
@@ -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);
diff --git a/services/credentials/java/com/android/server/credentials/CreateRequestSession.java b/services/credentials/java/com/android/server/credentials/CreateRequestSession.java
index 656e44c4bff27..0c1133ce87932 100644
--- a/services/credentials/java/com/android/server/credentials/CreateRequestSession.java
+++ b/services/credentials/java/com/android/server/credentials/CreateRequestSession.java
@@ -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);
diff --git a/services/credentials/java/com/android/server/credentials/GetRequestSession.java b/services/credentials/java/com/android/server/credentials/GetRequestSession.java
index ce26c885d55f4..13f4b542a83e5 100644
--- a/services/credentials/java/com/android/server/credentials/GetRequestSession.java
+++ b/services/credentials/java/com/android/server/credentials/GetRequestSession.java
@@ -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);