From c82767f627993c383b62fde6088119bb2acdab33 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Wed, 3 Mar 2021 10:30:06 +0000
Subject: [PATCH] Return RESULT_OK RequestManageCredentials

Bug: 177979648
Test: Manual testing
Change-Id: I3b4968131f8c7b811752704808d0ef4df617a658
---
 .../android/settings/security/RequestManageCredentials.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/security/RequestManageCredentials.java b/src/com/android/settings/security/RequestManageCredentials.java
index 4ee4fdf949a..eb7a7d82abf 100644
--- a/src/com/android/settings/security/RequestManageCredentials.java
+++ b/src/com/android/settings/security/RequestManageCredentials.java
@@ -208,7 +208,7 @@ public class RequestManageCredentials extends Activity {
                     .write();
             finishWithResultCancelled();
         });
-        allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementApp());
+        allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementAppAndFinish());
     }
 
     private void loadExtendedFloatingActionButton() {
@@ -220,13 +220,14 @@ public class RequestManageCredentials extends Activity {
         });
     }
 
-    private void setOrUpdateCredentialManagementApp() {
+    private void setOrUpdateCredentialManagementAppAndFinish() {
         try {
             mKeyChainConnection.getService().setCredentialManagementApp(
                     mCredentialManagerPackage, mAuthenticationPolicy);
             DevicePolicyEventLogger
                     .createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REQUEST_ACCEPTED)
                     .write();
+            setResult(RESULT_OK);
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to set credential manager app", e);
             logRequestFailure();