From 40edaf853bb4ce5e1da86190996ae767957538ae Mon Sep 17 00:00:00 2001
From: Reema Bajwa <reemabajwa@google.com>
Date: Sun, 30 Oct 2022 20:32:19 +0000
Subject: [PATCH] Fix small issue in selection logic Test: Locally built &
 deployed

Change-Id: Id0c83c92fb0c84611b25e853a1c467db8ee4b339
---
 .../com/android/server/credentials/CredentialManagerUi.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java
index 69fb1eaa7543f..5f25e3df8a9a1 100644
--- a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java
+++ b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java
@@ -16,7 +16,6 @@
 package com.android.server.credentials;
 
 import android.annotation.NonNull;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.credentials.ui.IntentFactory;
@@ -48,7 +47,7 @@ public class CredentialManagerUi {
     };
 
     private void handleUiResult(int resultCode, Bundle resultData) {
-        if (resultCode == Activity.RESULT_OK) {
+        if (resultCode == UserSelectionDialogResult.RESULT_CODE_DIALOG_COMPLETE_WITH_SELECTION) {
             UserSelectionDialogResult selection = UserSelectionDialogResult
                     .fromResultData(resultData);
             if (selection != null) {
@@ -56,7 +55,7 @@ public class CredentialManagerUi {
             } else {
                 Slog.i(TAG, "No selection found in UI result");
             }
-        } else if (resultCode == Activity.RESULT_CANCELED) {
+        } else if (resultCode == UserSelectionDialogResult.RESULT_CODE_DIALOG_CANCELED) {
             mCallbacks.onUiCancelation();
         }
     }