summaryrefslogtreecommitdiffstats
path: root/services/core/java
Commit message (Expand)AuthorAgeFilesLines
* Add support for injecting events into ActivityContainers.Jeff Brown2014-02-112-6/+39
* Merge "First <provider> always wins."Jeff Sharkey2014-02-111-0/+5
|\
| * First <provider> always wins.Jeff Sharkey2014-02-111-0/+5
* | Merge "Add concepts of related users and managed profiles to user manager."Kenny Guy2014-02-111-0/+69
|\ \
| * | Add concepts of related users and managed profiles to user manager.Kenny Guy2014-02-111-0/+69
* | | am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in C...Narayan Kamath2014-02-111-11/+11
|\ \ \
| * | | am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrServ...Narayan Kamath2014-02-111-11/+11
* | | | am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Contex...Jeff Brown2014-02-1110-36/+53
|\ \ \ \ | |/ / /
| * | | am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-...Jeff Brown2014-02-1110-36/+53
| |\ \ \
| | * \ \ Merge "Make SystemService constructor take a Context." into klp-modular-devJeff Brown2014-02-1110-36/+53
| | |\ \ \
| | | * | | Make SystemService constructor take a Context.Jeff Brown2014-02-1010-36/+53
* | | | | | am 2d6b55aa: am 312ba86b: Change task removal sequenceCraig Mautner2014-02-112-11/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 312ba86b: Change task removal sequenceCraig Mautner2014-02-112-11/+11
| |\ \ \ \ \ | | |/ / / /
| | * | | | Change task removal sequenceCraig Mautner2014-02-102-11/+11
| | |/ / /
* | | | | Maybe fix issue #12957738: SecurityException in...Dianne Hackborn2014-02-101-15/+20
| |_|/ / |/| | |
* | | | am 779d204a: am 9ef471f7: Don\'t remove Activities and Tasks until animation ...Craig Mautner2014-02-106-17/+63
|\ \ \ \ | |/ / /
| * | | am 9ef471f7: Don\'t remove Activities and Tasks until animation doneCraig Mautner2014-02-076-17/+63
| |\ \ \ | | |/ /
| | * | Don't remove Activities and Tasks until animation doneCraig Mautner2014-02-076-17/+63
* | | | am 88daefd4: am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/...Christopher Tate2014-02-101-0/+5
|\ \ \ \ | |/ / /
| * | | am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app"Christopher Tate2014-02-071-0/+5
* | | | am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after...Dan Sandler2014-02-101-0/+1
|\ \ \ \ | |/ / /
| * | | am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"Dan Sandler2014-02-071-0/+1
| |/ /
| * | DO NOT MERGE. Test for Configuration differences before changing.Craig Mautner2014-02-062-26/+22
* | | Merge "Battery stats: more events, fixes."Dianne Hackborn2014-02-072-16/+102
|\ \ \
| * | | Battery stats: more events, fixes.Dianne Hackborn2014-02-072-17/+102
* | | | am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional s...Adam Lesinski2014-02-063-1151/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Check feature bits before loading optional services" into klp-modular-devAdam Lesinski2014-02-063-1158/+0
| |\ \ \
| | * | | Check feature bits before loading optional servicesAdam Lesinski2014-02-053-1158/+0
* | | | | Test for Configuration differences before changing.Craig Mautner2014-02-062-20/+18
| |_|_|/ |/| | |
* | | | am 14d74b82: am 1bf2b873: Defer detach until animations are complete.Craig Mautner2014-02-065-7/+44
|\ \ \ \
| * \ \ \ am 1bf2b873: Defer detach until animations are complete.Craig Mautner2014-02-065-7/+44
| |\ \ \ \ | | |/ / /
| | * | | Defer detach until animations are complete.Craig Mautner2014-02-055-7/+44
* | | | | am 481b54be: am dc548483: Move activities from DisplayContent to TaskStackCraig Mautner2014-02-065-199/+169
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am dc548483: Move activities from DisplayContent to TaskStackCraig Mautner2014-02-065-199/+169
| |\ \ \ | | |/ /
| | * | Move activities from DisplayContent to TaskStackCraig Mautner2014-02-055-199/+169
| | |/
* | | Merge "Improve logging of first wake lock, history size."Dianne Hackborn2014-02-064-70/+145
|\ \ \
| * | | Improve logging of first wake lock, history size.Dianne Hackborn2014-02-054-70/+145
* | | | Merge "Add new RIL commands to read/write NV items and reset NV config."Jake Hamby2014-02-051-6/+11
|\ \ \ \
| * | | | Add new RIL commands to read/write NV items and reset NV config.Jake Hamby2014-02-031-6/+11
| |/ / /
* | | | resolved conflicts for merge of 32360147 to masterCraig Mautner2014-02-0413-209/+400
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am df88d730: Add IIntentSender to ActivityContainer.startActivityCraig Mautner2014-02-0413-209/+400
| |\ \ | | |/
| | * Add IIntentSender to ActivityContainer.startActivityCraig Mautner2014-02-0413-209/+400
| * | resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aospNarayan Kamath2014-01-311-1/+1
| |/
* | Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"Christopher Tate2014-02-033-83/+624
|\ \
| * | Introduce "IdleService" API to expose idle-time maintenance to appsChristopher Tate2014-01-313-83/+624
* | | am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-devHui Lu2014-01-311-0/+4
|\ \ \ | |/ / |/| / | |/
| * Merge "Add proxy as another network." into klp-modular-devHui Lu2014-01-301-0/+4
| |\
| | * Add proxy as another network.Hui Lu2014-01-301-0/+4
| * | am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make grap...Narayan Kamath2014-01-281-2/+2
* | | Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"Brian Carlstrom2014-01-311-1/+1
|\ \ \