commit 7c896fa1c021a0b53a8714f36a19531fca6fa886
author Winson Chung <winsonc@google.com> Thu Jun 27 17:10:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 27 17:10:57 2019 -0700
tree e4d10f929d479fcea2fdc98150796ab320db816b
parent 48d5ca1692046fa9753ca970c68376e10d3f4aa8
parent 27424848e8ca3e566848b9293deff05249fc9688

Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963 am: 8bf207bab6
am: 27424848e8

Change-Id: Ifce634aa74f79829ba618b0d8b20c75e04a38532

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 07dd1dd..cf1ae94 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2271,6 +2271,7 @@
                   android:excludeFromRecents="true"
                   android:label=""
                   android:screenOrientation="nosensor"
+                  android:taskAffinity="com.android.settings.FallbackHome"
                   android:theme="@style/FallbackHome">
             <intent-filter android:priority="-1000">
                 <action android:name="android.intent.action.MAIN" />