From ec8f79925a04f7a05b5ee0663f97c70185a6740e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 24 Apr 2020 11:14:31 -0700
Subject: [PATCH] Ensure CryptKeeper runs with its own task affinity

- Otherwise, when it finishes and home is started in the same task,
  subsequent launches of Settings activities will be routed to the
  home task incorrectly.

Bug: 154890505
Bug: 150983816
Test: Flash & wipe device, finish SUW, launch a quick settings
      settings activity, ensure it starts in a new non-home task
Change-Id: I48db005a5c292f76ab23b34a194b209c6d1b2335
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 212290d81a6..11c67a18ad3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2269,6 +2269,7 @@
                   android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"
                   android:windowSoftInputMode="adjustResize"
                   android:screenOrientation="nosensor"
+                  android:taskAffinity="com.android.settings.CryptKeeper"
                   android:process=":CryptKeeper">
             <intent-filter android:priority="10">
                 <action android:name="android.intent.action.MAIN" />