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

Revert "Add generateChallenge() in onResume()"

Browse Source 
This reverts commit d59150eca6.

Bug: 133498264
Bug: 133440610

Reason for revert: Fixing in a different way

Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
This commit is contained in:
Kevin Chyn
2019-06-04 19:41:52 +00:00
parent 7f8a269a3a
commit e716ce107d
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -145,11 +145,7 @@ public class FaceSettings extends DashboardFragment {
if (savedInstanceState != null) { if (savedInstanceState != null) {
mToken = savedInstanceState.getByteArray(KEY_TOKEN); mToken = savedInstanceState.getByteArray(KEY_TOKEN);
} }
}
@Override
public void onResume() {
super.onResume();
if (mToken == null) { if (mToken == null) {
final long challenge = mFaceManager.generateChallenge(); final long challenge = mFaceManager.generateChallenge();
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this); ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
@@ -159,7 +155,13 @@ public class FaceSettings extends DashboardFragment {
Log.e(TAG, "Password not set"); Log.e(TAG, "Password not set");
finish(); finish();
} }
} else { }
}
@Override
public void onResume() {
super.onResume();
if (mToken != null) {
mAttentionController.setToken(mToken); mAttentionController.setToken(mToken);
mEnrollController.setToken(mToken); mEnrollController.setToken(mToken);
} }
@@ -194,12 +196,13 @@ public class FaceSettings extends DashboardFragment {
} }
@Override @Override
public void onStop() { public void onDestroy() {
super.onStop(); super.onDestroy();
mToken = null; if (getActivity().isFinishing()) {
final int result = mFaceManager.revokeChallenge(); final int result = mFaceManager.revokeChallenge();
if (result < 0) { if (result < 0) {
Log.w(TAG, "revokeChallenge failed, result: " + result); Log.w(TAG, "revokeChallenge failed, result: " + result);
}
} }
} }