From b08f5baa4cb65569310821f1e9b6e783cefee7a2 Mon Sep 17 00:00:00 2001
From: Milton Wu <mingjuwu@google.com>
Date: Mon, 27 Jan 2025 09:27:20 +0000
Subject: [PATCH] Support finishing Fingerprint Settings if TIMEOUT

Finish Fingerprint Settings if extra preference return TIMEOUT error
code in onActivityResult.

Bug: 392540535
Flag: EXEMPT support interface, flag only used in impl part
Test: atest FingerprintSettingsFragmentTest
Change-Id: I2c593aaa3fe960a3981b4030ff7b3145188afcfc
---
 .../biometrics/fingerprint/FingerprintSettings.java      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index e200530accb..08bd45090cf 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -1313,6 +1313,15 @@ public class FingerprintSettings extends SubSettings {
                     }
                 }
             } else if (requestCode == LAUNCH_EXT_PREF_REQUEST) {
+                if (resultCode == RESULT_TIMEOUT) {
+                    Activity activity = getActivity();
+                    if (activity != null) {
+                        activity.setResult(resultCode);
+                        activity.finish();
+                        return;
+                    }
+                }
+
                 if (!mLaunchedExtPrefKey.isEmpty()) {
                     final Preference preference = findPreference(mLaunchedExtPrefKey);
                     if (preference instanceof PrimarySwitchIntentPreference) {