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

Commit 238ab956 authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

Merge "Set documentLaunchMode to alias activity" into sc-dev

parents 2791092c 4a7e51c3

core/java/android/content/pm/parsing/component/ParsedActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public class ParsedActivity extends ParsedMainComponent { 
        alias.nonLocalizedLabel = target.nonLocalizedLabel;

        alias.launchMode = target.launchMode;

        alias.lockTaskLaunchMode = target.lockTaskLaunchMode;

        alias.documentLaunchMode = target.documentLaunchMode;

        alias.descriptionRes = target.descriptionRes;

        alias.screenOrientation = target.screenOrientation;

        alias.taskAffinity = target.taskAffinity;
@@ -179,7 +180,6 @@ public class ParsedActivity extends ParsedMainComponent { 
//        alias.exported = target.exported;

//        alias.permission = target.permission;

//        alias.splitName = target.splitName;

//        alias.documentLaunchMode = target.documentLaunchMode;

//        alias.persistableMode = target.persistableMode;

//        alias.rotationAnimation = target.rotationAnimation;

//        alias.colorMode = target.colorMode;