summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yuhan Zhao <zhaoyuhan@google.com> 2020-03-12 19:18:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-03-12 19:18:52 +0000
commita8375cc9f85380254d18ae48b59e8954c0b7886e (patch)
tree26ed970c17a92508c46473ec7919592e69557c26
parent987b12ddcf39bc794778651ac79030d0c8bc0826 (diff)
parentd40862a9b12815f51702dba8981ff95fbd3e0481 (diff)
Merge "Rebasing ag/10503271 into the rvc-dev branch." into rvc-dev
-rw-r--r--core/res/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0dd3ad639aa1..071bb11d7738 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -5200,6 +5200,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>