Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev

Browse Source 
* commit 'a0d41262d48eb48285bb3a0e71bfc5b7b89be601':
  Copy lockTaskLaunchMode from target activity to its alias.
This commit is contained in:
Yao Chen
2015-06-10 03:36:57 +00:00
committed by Android Git Automerger
parent b46211746c a0d41262d4
commit 72df690ce0
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/pm/PackageParser.java
View File

@@ -3357,6 +3357,7 @@ public class PackageParser {
info.labelRes = target.info.labelRes;
info.nonLocalizedLabel = target.info.nonLocalizedLabel;
info.launchMode = target.info.launchMode;
info.lockTaskLaunchMode = target.info.lockTaskLaunchMode;
info.processName = target.info.processName;
if (info.descriptionRes == 0) {
info.descriptionRes = target.info.descriptionRes;