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

Commit 8b82074c authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Set documentLaunchMode to alias activity" into sc-dev am: 238ab956 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13698285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08b7b276fcd9879ed709e3dba020d1dde7e6fd7e
parents 671bb6e8 238ab956

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

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

        alias.nonLocalizedLabel = target.nonLocalizedLabel;

        alias.launchMode = target.launchMode;

        alias.launchMode = target.launchMode;

        alias.lockTaskLaunchMode = target.lockTaskLaunchMode;

        alias.lockTaskLaunchMode = target.lockTaskLaunchMode;

        alias.documentLaunchMode = target.documentLaunchMode;

        alias.descriptionRes = target.descriptionRes;

        alias.descriptionRes = target.descriptionRes;

        alias.screenOrientation = target.screenOrientation;

        alias.screenOrientation = target.screenOrientation;

        alias.taskAffinity = target.taskAffinity;

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

//        alias.exported = target.exported;

//        alias.permission = target.permission;

//        alias.permission = target.permission;

//        alias.splitName = target.splitName;

//        alias.splitName = target.splitName;

//        alias.documentLaunchMode = target.documentLaunchMode;

//        alias.persistableMode = target.persistableMode;

//        alias.persistableMode = target.persistableMode;

//        alias.rotationAnimation = target.rotationAnimation;

//        alias.rotationAnimation = target.rotationAnimation;

//        alias.colorMode = target.colorMode;

//        alias.colorMode = target.colorMode;