From e716ce107de6e7bcc1beddc3aa0d2326dd0a2b59 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Tue, 4 Jun 2019 19:41:52 +0000
Subject: [PATCH] Revert "Add generateChallenge() in onResume()"

This reverts commit d59150eca6d7c0d0ea8a3fcba2a1add4beb36f05.

Bug: 133498264
Bug: 133440610

Reason for revert: Fixing in a different way

Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
---
 .../biometrics/face/FaceSettings.java         | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 05e37781c70..48370d9fb78 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -145,11 +145,7 @@ public class FaceSettings extends DashboardFragment {
         if (savedInstanceState != null) {
             mToken = savedInstanceState.getByteArray(KEY_TOKEN);
         }
-    }
 
-    @Override
-    public void onResume() {
-        super.onResume();
         if (mToken == null) {
             final long challenge = mFaceManager.generateChallenge();
             ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
@@ -159,7 +155,13 @@ public class FaceSettings extends DashboardFragment {
                 Log.e(TAG, "Password not set");
                 finish();
             }
-        } else {
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mToken != null) {
             mAttentionController.setToken(mToken);
             mEnrollController.setToken(mToken);
         }
@@ -194,12 +196,13 @@ public class FaceSettings extends DashboardFragment {
     }
 
     @Override
-    public void onStop() {
-        super.onStop();
-        mToken = null;
-        final int result = mFaceManager.revokeChallenge();
-        if (result < 0) {
-            Log.w(TAG, "revokeChallenge failed, result: " + result);
+    public void onDestroy() {
+        super.onDestroy();
+        if (getActivity().isFinishing()) {
+            final int result = mFaceManager.revokeChallenge();
+            if (result < 0) {
+                Log.w(TAG, "revokeChallenge failed, result: " + result);
+            }
         }
     }