From 4993753ff59506ebcafc4698be4c6cec88b3e91f Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Fri, 19 Nov 2021 14:46:15 +0800 Subject: [PATCH] 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 aa005a3e91ce2..18a989ebf859e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -11124,7 +11124,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;