diff options
| author | 2021-11-19 14:46:15 +0800 | |
|---|---|---|
| committer | 2021-11-22 06:24:58 +0000 | |
| commit | 674aed9fb5a2a4411660507a7edb6fe1e351ed9b (patch) | |
| tree | b306aba075f5288269f0bd91a12edad8c88ff353 | |
| parent | 7d75b59495c5ca0e737109fffb00e9147ca67a86 (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 821900bf57fe..d8b82380c663 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; |