Removes fingerprint onboard screen

This screen isn't used anymore. This also fixes some fingerprint
work in setup wizard to use the userId instead.

Change-Id: Icb1debaf7b2766069a53a75eab6152d6b816b03c

1 files changed, 4 insertions, 0 deletions

diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index 505d140a9c..74a280c874 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -18,6 +18,7 @@ package com.android.settings.fingerprint;
 
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.UserHandle;
 import android.view.View;
 import android.widget.Button;
 
@@ -39,6 +40,9 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
     protected Intent getEnrollingIntent() {
         Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+        if (mUserId != UserHandle.USER_NULL) {
+            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
+        }
         SetupWizardUtils.copySetupExtras(getIntent(), intent);
         return intent;
     }