From 19235b8bbaba16a985bc9f8ebcce6370fc65adb5 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Wed, 12 May 2021 17:06:42 +0000
Subject: [PATCH] Fix task affinity for NotificationAccessConfirmationActivity

Fix: 186029669

Test: manual
Change-Id: I366d4d6502d6d89b3d9d53d9190f376f678bccc1
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 323ce38d40e..61c0c4ea2db 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2887,6 +2887,7 @@
 
         <!-- Confirmation dialog for enabling notification access from CompanionDeviceManager -->
         <activity android:name=".notification.NotificationAccessConfirmationActivity"
+                  android:taskAffinity=".notification.NotificationAccessConfirmationActivity"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
 
         <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver"