diff options
| author | Yao Chen <yaochen@google.com> | 2015-06-10 03:28:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 03:28:29 +0000 |
| commit | a0d41262d48eb48285bb3a0e71bfc5b7b89be601 (patch) | |
| tree | 6263a654ead4af340eb8c13a12960b893ca5cc51 /core/java/android/content | |
| parent | 5b7793cacf3910a386182a9b78460934d00dfdae (diff) | |
| parent | 597ad3fb51accb68a8e61351421a0ed1d6c29869 (diff) | |
Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 755eb5b5fb62..83b01409194f 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -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; |