From 468a72aed3406db33935351731f6731cb64b4498 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 19 May 2017 12:22:44 -0700 Subject: [PATCH] Fix settings crash due to enrolling error Test: There's a condition where FP enrollment fails and a fragment transaction/commit occurs after onSaveInstanceState. We should be using commitAllowingStateLoss() instead of commit() I'm not able to repro this issue but from looking at the stack trace this should fix the problem. Fixes: 38432354 Change-Id: I56b9c8d2efc45e9d77f29b897280f5378c3a84a0 --- .../settings/fingerprint/FingerprintEnrollFindSensor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index 107838ce587..5152d3121b0 100644 --- 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); }