PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support finishing Fingerprint Settings if TIMEOUT" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-01-31 05:53:12 -08:00
committed by Android (Google) Code Review
parent fe0c780928 b08f5baa4c
commit 8a53aecafe
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -1313,6 +1313,15 @@ public class FingerprintSettings extends SubSettings {
} }
} }
} else if (requestCode == LAUNCH_EXT_PREF_REQUEST) { } 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()) { if (!mLaunchedExtPrefKey.isEmpty()) {
final Preference preference = findPreference(mLaunchedExtPrefKey); final Preference preference = findPreference(mLaunchedExtPrefKey);
if (preference instanceof PrimarySwitchIntentPreference) { if (preference instanceof PrimarySwitchIntentPreference) {