From d40862a9b12815f51702dba8981ff95fbd3e0481 Mon Sep 17 00:00:00 2001
From: Yuhan Zhao <zhaoyuhan@google.com>
Date: Tue, 3 Mar 2020 14:33:37 -0800
Subject: [PATCH] Rebasing ag/10503271 into the rvc-dev branch.

Test: atest -c 'CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedProfileOwnerTest#testLockTask'
Bug: b/149778685
Change-Id: I094b8e480f5c37628b98c73a82fdd325d0e63bec
---
 core/res/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 5086c7e985984..46fb63d429505 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -5189,6 +5189,7 @@
         <activity android:name="com.android.internal.app.BlockedAppActivity"
                 android:theme="@style/Theme.Dialog.Confirmation"
                 android:excludeFromRecents="true"
+                android:lockTaskMode="always"
                 android:process=":ui">
         </activity>