commit e4a04eccd8f7fa6e53e0b53a62c59cf1b9f8da9e
author Julia Reynolds <juliacr@google.com> Tue Apr 28 18:51:01 2020 -0400
committer Julia Reynolds <juliacr@google.com> Tue Apr 28 19:11:47 2020 -0400
tree e4cafd086a04f2148308b70be1f7b6414a21de6a
parent 6b2716fce0b35a192127792a310d84e597e4a5e7

Fix history task stack

Test: manual
Bug: 154721261
Change-Id: Ib39fff447d0d6571b4267700eaf39e425fa114d7

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 11c67a1..3bb9f5d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1200,8 +1200,7 @@
 
         <activity
             android:name=".notification.history.NotificationHistoryActivity"
-            android:label="@string/notification_history_title"
-            android:taskAffinity="com.android.settings.notification">
+            android:label="@string/notification_history_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_HISTORY" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2532,7 +2531,6 @@
         <activity
             android:name="Settings$ConfigureNotificationSettingsActivity"
             android:label="@string/configure_notification_settings"
-            android:taskAffinity="com.android.settings.notification"
             android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_SETTINGS" />