port settings over to new metrics enum

[android-x86/packages-apps-Settings.git] / src / com / android / settings / fingerprint / FingerprintEnrollIntroduction.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index c1347f5..23a81bc 100644 (file)
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.view.View;
 
-import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.HelpUtils;
@@ -86,6 +86,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
         if (token != null) {
             intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
         }
+        if (mUserId != UserHandle.USER_NULL) {
+            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
+        }
         startActivityForResult(intent, FINGERPRINT_FIND_SENSOR_REQUEST);
     }
 
@@ -95,9 +98,6 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
 
     protected Intent getFindSensorIntent() {
         Intent intent = new Intent(this, FingerprintEnrollFindSensor.class);
-        if (mUserId != UserHandle.USER_NULL) {
-            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
-        }
         return intent;
     }
 
@@ -137,6 +137,6 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
 
     @Override
     protected int getMetricsCategory() {
-        return MetricsLogger.FINGERPRINT_ENROLL_INTRO;
+        return MetricsEvent.FINGERPRINT_ENROLL_INTRO;
     }
 }