Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 674aed9f authored by Louis Chang's avatar Louis Chang
Browse files

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
parent 7d75b594

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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;