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

Commit 9e7bf1bc authored by Iris Yang's avatar Iris Yang Committed by Android (Google) Code Review
Browse files

Merge "Make ResolverActivity default allow being launched on remote display" into tm-qpr-dev

parents 36f670f6 43dbedd6

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

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

            mResolveActivity.processName = pkg.getProcessName();

            mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;

            mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;

            mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS

            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.theme = 0;

            mResolveActivity.exported = true;

            mResolveActivity.exported = true;

            mResolveActivity.enabled = true;

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

                mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;

                mResolveActivity.documentLaunchMode = ActivityInfo.DOCUMENT_LAUNCH_NEVER;

                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;

                        | ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY

                        | ActivityInfo.FLAG_CAN_DISPLAY_ON_REMOTE_DEVICES;

                mResolveActivity.theme = R.style.Theme_Material_Dialog_Alert;

                mResolveActivity.theme = R.style.Theme_Material_Dialog_Alert;

                mResolveActivity.exported = true;

                mResolveActivity.exported = true;

                mResolveActivity.enabled = true;

                mResolveActivity.enabled = true;