From 674aed9fb5a2a4411660507a7edb6fe1e351ed9b Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Fri, 19 Nov 2021 14:46:15 +0800 Subject: [PATCH] RESTRICT AUTOMERGE - Allow ResolverActivity to relinquish task identity Or the task effective uid may still be system uid after ResolverActivity finishes. The ResolverActivity should relinquish the task identity to the next activity, just like ChooserActivity does. Bug: 205996115 Test: manually check the task effective uid of the test app Change-Id: I311da4e7fe9fd715f29202c0882891ec1d9dd1d2 --- .../core/java/com/android/server/pm/PackageManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 821900bf57fea..d8b82380c663a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -15361,7 +15361,8 @@ public class PackageManagerService extends IPackageManager.Stub mResolveActivity.processName = "system:ui"; mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE; mResolveActivity.documentLaunchMode = ActivityInfo.DOCUMENT_LAUNCH_NEVER; - mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS; + mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS + | ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY; mResolveActivity.theme = R.style.Theme_Material_Dialog_Alert; mResolveActivity.exported = true; mResolveActivity.enabled = true;