commit 172d03c7582d84f51ca97651b2b7547eb80a2b75
author Ilya Matyukhin <ilyamaty@google.com> Wed Apr 24 16:27:55 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 24 16:27:55 2019 +0000
tree 89fecb642ba256cb36ecff9614451637127439ed
parent 4d033779016a89a8943a0f5b8318267e4ccdfe62
parent 3be240fd8a9d34ed80eb08d835e93378a68dcd6e

Merge "Use auth token from intent extras" into qt-dev

src/com/android/settings/biometrics/face/FaceSettings.java

diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index f5216d8..48370d9 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -54,7 +54,7 @@
 public class FaceSettings extends DashboardFragment {
 
     private static final String TAG = "FaceSettings";
-    private static final String KEY_TOKEN = "key_token";
+    private static final String KEY_TOKEN = "hw_auth_token";
 
     private UserManager mUserManager;
     private FaceManager mFaceManager;
@@ -111,6 +111,7 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
         mUserManager = getPrefContext().getSystemService(UserManager.class);
         mFaceManager = getPrefContext().getSystemService(FaceManager.class);
         mUserId = getActivity().getIntent().getIntExtra(