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

Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev

Browse Source 
am: fb51827247

* commit 'fb51827247de116c184e7fef31978f4f8541194f':
  Fix crash in fingerprint enrollment due to async transaction
This commit is contained in:
Jim Miller
2016-03-07 21:40:44 +00:00
committed by android-build-merger
parent d24f3d9fa9 fb51827247
commit 76f9181061
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -175,7 +175,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
if (!isChangingConfigurations()) { if (!isChangingConfigurations()) {
if (mSidecar != null) { if (mSidecar != null) {
mSidecar.cancelEnrollment(); mSidecar.cancelEnrollment();
getFragmentManager().beginTransaction().remove(mSidecar).commit(); getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
} }
finish(); finish();
} }
@@ -186,7 +186,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
if (mSidecar != null) { if (mSidecar != null) {
mSidecar.setListener(null); mSidecar.setListener(null);
mSidecar.cancelEnrollment(); mSidecar.cancelEnrollment();
getFragmentManager().beginTransaction().remove(mSidecar).commit(); getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
mSidecar = null; mSidecar = null;
} }
super.onBackPressed(); super.onBackPressed();