From 7bfc62f562f92304a876bfb3f79f9e229286ccf3 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 1 May 2018 10:22:08 -0700
Subject: [PATCH] Workaround task-resolution bug in AM

- Keep launching notification settings in the Settings task. This is not
  the expected behavior, but only a workaround until b/72420153 is
  fixed.

Bug: 72420153
Test: Enter PIP, go to app > notifications > additional settings, ensure
      that it doesn't start in the PIP task

Change-Id: I73e704a283285462d4884db21923818cfb6deead
---
 .../settings/notification/NotificationSettingsBase.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index faf6fb3e1dc..8bf50a6000c 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -232,10 +232,10 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
                 }
                 continue;
             }
+            // TODO(78660939): This should actually start a new task
             mAppRow.settingsIntent = intent
                     .setPackage(null)
-                    .setClassName(activityInfo.packageName, activityInfo.name)
-                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    .setClassName(activityInfo.packageName, activityInfo.name);
             if (mChannel != null) {
                 mAppRow.settingsIntent.putExtra(Notification.EXTRA_CHANNEL_ID, mChannel.getId());
             }