commit 19235b8bbaba16a985bc9f8ebcce6370fc65adb5
author Guojing Yuan <guojing@google.com> Wed May 12 17:06:42 2021 +0000
committer Guojing Yuan <guojing@google.com> Wed May 12 19:37:44 2021 +0000
tree f32055fad7e251265bee351c41c1cc7ace3543dd
parent 989570a9b6b9333c6f0e941f27734cc9400201f5

Fix task affinity for NotificationAccessConfirmationActivity

Fix: 186029669

Test: manual
Change-Id: I366d4d6502d6d89b3d9d53d9190f376f678bccc1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 323ce38..61c0c4e 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"