From 2334f7af9d5ad812c01be4ae6bb3e90dffab7695 Mon Sep 17 00:00:00 2001
From: joshmccloskey <joshmccloskey@google.com>
Date: Tue, 19 Mar 2019 16:31:04 -0700
Subject: [PATCH] Launch ConfirmDeviceCredentials on a new task stack

Fixes: 123951409
Test: Manually verified with biometricpromptdemo app.
Change-Id: I0d99a254f3e9a4da7dc329d51fe32ae6d38f75ed
---
 .../java/com/android/server/biometrics/BiometricService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
index f313e1d48c539..516844d85484b 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -628,6 +628,9 @@ public class BiometricService extends SystemService {
                             null /* description */);
                     // 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.
+                    intent.setFlags(
+                            Intent.FLAG_ACTIVITY_MULTIPLE_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
                     getContext().startActivityAsUser(intent, UserHandle.CURRENT);
                 });
                 return;