From dcd6fc593da212d985a37b199700211b29fccbc1 Mon Sep 17 00:00:00 2001
From: Pavel Grafov <pgrafov@google.com>
Date: Fri, 29 May 2020 13:57:24 +0100
Subject: [PATCH] Launch ForgotPasswordActivity in a new task.

This way the notificaiton about locked profile can function as
expected. Prior to this change ForgotPasswordActivity was launched
in the same task as initial profile credential confirmation. As a
result, when ForgotPasswordActivity was in the foreground, the
notification tap won't do anything since a task for
CONFIRM_DEVICE_CREDENTIAL_WITH_USER was already in the
foreground.

Bug: 157554361
Test: manual, with TestDPC
Change-Id: Ifc9d8e1fb8658c3f22926d7fa35da1e60eadb3db
---
 .../settings/password/ConfirmDeviceCredentialBaseFragment.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index a60fab97a3d..3440071bf40 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -152,6 +152,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
             mForgotButton.setOnClickListener(v -> {
                 final Intent intent = new Intent();
                 intent.setClassName(SETTINGS_PACKAGE_NAME, ForgotPasswordActivity.class.getName());
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 getActivity().startActivity(intent);
                 getActivity().finish();