From bc68ba22f107d80b50cecb445b3b8148c4489923 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 26 May 2015 17:52:01 -0700
Subject: [PATCH] Cancel enrollment when navigating out of enrollment

Change-Id: Ifee1572189765cbfa4c23e6176831c8f729bbd2b
---
 .../settings/fingerprint/FingerprintEnrollEnrolling.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 6d0d10bf74b..a0a50036738 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -139,6 +139,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         super.onStop();
         mSidecar.setListener(null);
         stopIconAnimation();
+        if (!isChangingConfigurations()) {
+            finish();
+        }
     }
 
     private void animateProgress(int progress) {
@@ -184,6 +187,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
     @Override
     public void onEnrollmentError(CharSequence errString) {
         mErrorText.setText(errString);
+        stopIconAnimation();
     }
 
     @Override