Merge "Fix settings crash due to enrolling error" into oc-dev am: 5ccc2fe242

am: 2ca8635a5e Change-Id: I167959f2ef69bcda7fb604e3f3e85512799ce691
2017-05-20 00:01:59 +00:00
parent 17706e5777 2ca8635a5e
commit 3795082c83
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -134,7 +134,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
                    return;
                }
            }
-            getFragmentManager().beginTransaction().remove(mSidecar).commit();
+            getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
            mSidecar = null;
            startActivityForResult(getEnrollingIntent(), ENROLLING);
        }