summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ActivityThread.java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix persistent tasks and expand scope"Craig Mautner2014-06-171-1/+1
|\
| * Fix persistent tasks and expand scopeCraig Mautner2014-06-171-1/+1
* | Plumb split APKs into public API.Jeff Sharkey2014-06-171-10/+16
|/
* am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage a...Robin Lee2014-06-091-0/+5
|\
| * am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to u...Robin Lee2014-06-091-0/+5
| |\
| | * Choose CA certificate storage according to userIdRobin Lee2014-06-091-0/+5
| | * resolved conflicts for merge of 825dd9dd to klp-dev-plus-aospJeff Brown2014-03-131-29/+13
| | |\
| | | * Retain display when creating specialized contexts. (DO NOT MERGE)Jeff Brown2014-03-111-29/+13
| * | | resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aospJeff Brown2014-03-111-29/+13
| |\ \ \
| | * | | Retain display when creating specialized contexts. (DO NOT MERGE)Jeff Brown2014-03-111-29/+13
* | | | | Removing unnecessary public values. (Bug 14995844)Winson Chung2014-05-221-2/+2
* | | | | Merge "Enabling alternate recents on all form factors."Winson Chung2014-05-191-13/+4
|\ \ \ \ \
| * | | | | Enabling alternate recents on all form factors.Winson Chung2014-05-131-13/+4
* | | | | | Merge "Pass ActivityOptions back from finishing activity."Craig Mautner2014-05-141-18/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Pass ActivityOptions back from finishing activity.Craig Mautner2014-05-131-18/+9
* | | | | | Switch PacUrl storage from String to UriJason Monk2014-05-121-1/+2
|/ / / / /
* | | | | Merge "Introduce persistent forms of Activity lifecycle calls."Craig Mautner2014-05-091-28/+47
|\ \ \ \ \
| * | | | | Introduce persistent forms of Activity lifecycle calls.Craig Mautner2014-05-091-28/+47
* | | | | | Merge "Make proxy API public"Jason Monk2014-05-071-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make proxy API publicJason Monk2014-05-071-3/+3
* | | | | | Make GET_TASKS signature|system.Dianne Hackborn2014-05-021-33/+1
|/ / / / /
* | | | | Initial implementation of new voice interaction API.Dianne Hackborn2014-04-241-1/+6
* | | | | Merge "Enabling doc centric recents on phones."Winson Chung2014-04-241-1/+3
|\ \ \ \ \
| * | | | | Enabling doc centric recents on phones.Winson Chung2014-04-211-1/+3
* | | | | | Piping through ability for an Activity to remove its own task. (Bug 13735914)Winson Chung2014-04-231-2/+2
|/ / / / /
* | | | | Shared library resource supportAdam Lesinski2014-03-251-2/+2
* | | | | Retain display when creating specialized contexts.Jeff Brown2014-03-111-29/+13
* | | | | Initial changes for recents.Winson Chung2014-03-111-5/+11
* | | | | am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-081-2/+36
|\ \ \ \ \ | |/ / / /
| * | | | am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-081-2/+36
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | ART profiler usage.Dave Allison2014-03-071-2/+36
| * | | | am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."Narayan Kamath2014-03-071-0/+13
| |\ \ \ \ | | |/ / /
| | * | | Inform libcore of time format pref. changes.Narayan Kamath2014-03-071-0/+13
* | | | | Inform libcore of time format pref. changes.Narayan Kamath2014-03-071-0/+13
* | | | | Support HardwareLayers in RenderThreadJohn Reck2014-02-191-0/+1
* | | | | resolved conflicts for merge of 1cbea39f to masterNick Kralevich2014-02-121-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aospNick Kralevich2014-02-121-3/+3
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Runtime resource overlay, iteration 2MÃ¥rten Kongstad2014-02-031-3/+3
* | | | am 96ada57b: Merge "Allow for the possibility of null ActivityContainer" into...Craig Mautner2014-01-101-1/+2
|\ \ \ \ | |/ / /
| * | | Allow for the possibility of null ActivityContainerCraig Mautner2014-01-101-1/+2
* | | | resolved conflicts for merge of 88bfc6dd to masterCraig Mautner2014-01-081-2/+13
|\ \ \ \ | |/ / /
| * | | Merge "Extend stack management to other displays." into klp-modular-devCraig Mautner2014-01-081-2/+13
| |\ \ \ | | |/ / | |/| |
| | * | Extend stack management to other displays.Craig Mautner2014-01-061-2/+13
* | | | am 878df18c: am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a...Ian Rogers2014-01-071-0/+5
|\ \ \ \ | |/ / /
| * | | Add a call to registerAppInfo for the VMRuntimeDave Allison2013-12-181-0/+5
| |/ /
* | | resolved conflicts for merge of e0b14ea7 to masterKenny Root2013-12-131-2/+2
|\ \ \ | |/ /
| * | Use java.util.Objects instead on internal APIKenny Root2013-12-131-2/+2
* | | am f2156ad2: am 6a58a2e7: am cb3ee4ed: am 3254260b: Merge "Update Dalvik proc...Mathieu Chartier2013-12-101-2/+10
|\ \ \ | |/ /
| * | Merge "Update Dalvik process state through VMRuntime."Mathieu Chartier2013-12-101-2/+10
| |\ \ | | |/ | |/|
| | * Update Dalvik process state through VMRuntime.Mathieu Chartier2013-11-251-2/+10