From b13733024f463e69167c9dd249bb12fe36c3d312 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Wed, 3 Apr 2019 19:02:27 -0700
Subject: [PATCH] Launch ConfirmDeviceCredential with actual userId

Fixes: 129905318
Bug: 110907543

Test: Set up work profile, use BiometricPromptDemo to allow device
      credentials. Work profile demo app now requests work profile
      password.

Change-Id: Iec53966c6ad87021fdaa1808a1814a4abfbf89bb
---
 .../java/com/android/server/biometrics/BiometricService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
index e2f06309f8603..2fee68ee2dcd5 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -629,7 +629,7 @@ public class BiometricService extends SystemService {
                     mConfirmDeviceCredentialReceiver = receiver;
                     // Use this so we don't need to duplicate logic..
                     final Intent intent = kgm.createConfirmDeviceCredentialIntent(null /* title */,
-                            null /* description */);
+                            null /* description */, userId);
                     // Then give it the bundle to do magic behavior..
                     intent.putExtra(KeyguardManager.EXTRA_BIOMETRIC_PROMPT_BUNDLE, bundle);
                     // Create a new task with this activity located at the root.