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

Check for sidecar null-ness before removing

Browse Source 
Test: cd tests/robotests && mma
Bug: 36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
This commit is contained in:
Maurice Lam
2017-05-08 21:43:02 -07:00
parent fc8e64eccb
commit e1976ac302
8 changed files with 206 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -82,9 +82,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
@Override
public void onEnrollmentProgressChange(int steps, int remaining) {
mNextClicked = true;
if (!mSidecar.cancelEnrollment()) {
proceedToEnrolling();
}
proceedToEnrolling(true /* cancelEnrollment */);
}
@Override
@@ -95,7 +93,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
public void onEnrollmentError(int errMsgId, CharSequence errString) {
if (mNextClicked && errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
mNextClicked = false;
proceedToEnrolling();
proceedToEnrolling(false /* cancelEnrollment */);
}
}
});
@@ -123,15 +121,23 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
@Override
protected void onNextButtonClick() {
mNextClicked = true;
if (mSidecar == null || (mSidecar != null && !mSidecar.cancelEnrollment())) {
proceedToEnrolling();
}
proceedToEnrolling(true /* cancelEnrollment */);
}
private void proceedToEnrolling() {
getFragmentManager().beginTransaction().remove(mSidecar).commit();
mSidecar = null;
startActivityForResult(getEnrollingIntent(), ENROLLING);
private void proceedToEnrolling(boolean cancelEnrollment) {
if (mSidecar != null) {
if (cancelEnrollment) {
if (mSidecar.cancelEnrollment()) {
// Enrollment cancel requested. When the cancellation is successful,
// onEnrollmentError will be called with FINGERPRINT_ERROR_CANCELED, calling
// this again.
return;
}
}
getFragmentManager().beginTransaction().remove(mSidecar).commit();
mSidecar = null;
startActivityForResult(getEnrollingIntent(), ENROLLING);
}
}
@Override