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

Merge "Add generateChallenge() in onResume()" into qt-r1-dev

Browse Source 
am: dbe399a023

Change-Id: Ie6c6b6cb22ba783ee402e5c9fb0cae510c6f8fdf
This commit is contained in:
Ilya Matyukhin
2019-05-30 18:10:09 -07:00
committed by android-build-merger
parent d31d5fca30 dbe399a023
commit c6f766ec2b
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,11 @@ 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);
@@ -155,13 +159,7 @@ 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);
} }
@@ -196,15 +194,14 @@ public class FaceSettings extends DashboardFragment {
} }
@Override @Override
public void onDestroy() { public void onStop() {
super.onDestroy(); super.onStop();
if (getActivity().isFinishing()) { mToken = null;
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);
} }
} }
}
@Override @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {