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

Commit a6a9b179 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Make ResolverActivity default allow being launched on remote... 

Merge "Merge "Make ResolverActivity default allow being launched on remote display" into tm-qpr-dev am: 9e7bf1bc am: 7d05aa6c"
parents 9a8dbf26 28f7299c

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

+4 −2
Original line number Diff line number Diff line
@@ -7062,7 +7062,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
            mResolveActivity.processName = pkg.getProcessName();

            mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;

            mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS

                    | ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS;

                    | ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS

                    | ActivityInfo.FLAG_CAN_DISPLAY_ON_REMOTE_DEVICES;

            mResolveActivity.theme = 0;

            mResolveActivity.exported = true;

            mResolveActivity.enabled = true;
@@ -7095,7 +7096,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;

                mResolveActivity.documentLaunchMode = ActivityInfo.DOCUMENT_LAUNCH_NEVER;

                mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS

                        | ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY;

                        | ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY

                        | ActivityInfo.FLAG_CAN_DISPLAY_ON_REMOTE_DEVICES;

                mResolveActivity.theme = R.style.Theme_Material_Dialog_Alert;

                mResolveActivity.exported = true;

                mResolveActivity.enabled = true;