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
This commit is contained in:
Jim Miller
2016-03-07 20:55:38 +00:00
committed by Android (Google) Code Review
parent bd705413ba a9a8a18ac9
commit fb51827247
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 (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();