Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a53aeca authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support finishing Fingerprint Settings if TIMEOUT" into main

parents fe0c7809 b08f5baa

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+9 −0
Original line number Diff line number Diff line
@@ -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) {