Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52 am: 809335aaa6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955

Change-Id: I32c639ec0c79df89c917c3b2f4537eb3a34d9e0d
This commit is contained in:
TreeHugger Robot
2021-05-13 02:57:53 +00:00
committed by Automerger Merge Worker

View File

@@ -2887,6 +2887,7 @@
<!-- Confirmation dialog for enabling notification access from CompanionDeviceManager --> <!-- Confirmation dialog for enabling notification access from CompanionDeviceManager -->
<activity android:name=".notification.NotificationAccessConfirmationActivity" <activity android:name=".notification.NotificationAccessConfirmationActivity"
android:taskAffinity=".notification.NotificationAccessConfirmationActivity"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" /> android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
<receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver" <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver"