From c904c8e7d7fcd1c8178ff39e4a477f45f1258190 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 21 Jun 2018 14:42:45 -0700
Subject: [PATCH] Task affinity updates

- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings

The task affinity is messing with the back stack for this activity when
launched externally

Change-Id: I596090d0615cebd04ee9eb56e06ba2761859a52d
Fixes: 80281932
Fixes: 80290571
Test: manual
---
 AndroidManifest.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7094d8ef485..c9692324301 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2574,7 +2574,6 @@
             android:name="Settings$ConfigureNotificationSettingsActivity"
             android:label="@string/configure_notification_settings"
             android:exported="true"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_SETTINGS" />
@@ -2905,7 +2904,6 @@
         <activity
             android:name="Settings$AppDrawOverlaySettingsActivity"
             android:label="@string/draw_overlay"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />