From a9a8a18ac914690fcbd9cf172e645adfb7baa15c Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Fri, 4 Mar 2016 16:57:18 -0800
Subject: [PATCH] Fix crash in fingerprint enrollment due to async transaction

Fixes bug 27424654

Change-Id: I667374330fee00abc2f4ef7f881f8e98fd91567e
---
 .../settings/fingerprint/FingerprintEnrollEnrolling.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 2656f17c885..b4146270972 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -175,7 +175,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         if (!isChangingConfigurations()) {
             if (mSidecar != null) {
                 mSidecar.cancelEnrollment();
-                getFragmentManager().beginTransaction().remove(mSidecar).commit();
+                getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
             }
             finish();
         }
@@ -186,7 +186,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         if (mSidecar != null) {
             mSidecar.setListener(null);
             mSidecar.cancelEnrollment();
-            getFragmentManager().beginTransaction().remove(mSidecar).commit();
+            getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
             mSidecar = null;
         }
         super.onBackPressed();