summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am f24ee132: am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into k...Craig Mautner2014-02-131-0/+4
|\
| * am 4b79f838: Merge "Add debug for 12987986." into klp-modular-devCraig Mautner2014-02-121-0/+4
| |\
| | * Merge "Add debug for 12987986." into klp-modular-devCraig Mautner2014-02-121-0/+4
| | |\
| | | * Add debug for 12987986.Craig Mautner2014-02-121-0/+4
* | | | Extract automatic brightness strategyMichael Wright2014-02-123-683/+766
* | | | New ambient light level filtering for automatic brightnessMichael Wright2014-02-121-147/+326
* | | | am 69481d54: am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting...Craig Mautner2014-02-121-0/+3
|\ \ \ \ | |/ / /
| * | | am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into k...Craig Mautner2014-02-121-0/+3
| |\ \ \ | | |/ /
| | * | Merge "Don't add windows from exiting app tokens twice." into klp-modular-devCraig Mautner2014-02-121-0/+3
| | |\ \ | | | |/
| | | * Don't add windows from exiting app tokens twice.Craig Mautner2014-02-121-0/+3
| * | | am c4aee98a: Improve error handling in listener services.John Spurlock2014-02-121-0/+9
| |\ \ \ | | |/ /
| | * | Improve error handling in listener services.John Spurlock2014-02-121-0/+9
| | |/
* | | resolved conflicts for merge of 1cbea39f to masterNick Kralevich2014-02-122-2/+111
|\ \ \ | |/ /
| * | resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aospNick Kralevich2014-02-122-1/+110
| |\ \
| | * \ Merge "Runtime resource overlay, iteration 2"Dianne Hackborn2014-02-112-1/+109
| | |\ \
| | | * | Runtime resource overlay, iteration 2MÃ¥rten Kongstad2014-02-032-1/+109
| * | | | am 38f96e50: Add support for injecting events into ActivityContainers. (DO NO...Jeff Brown2014-02-123-10/+43
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add support for injecting events into ActivityContainers. (DO NOT MERGE)Jeff Brown2014-02-113-10/+43
* | | | | Merge "Improve error handling in listener services."John Spurlock2014-02-121-0/+9
|\ \ \ \ \
| * | | | | Improve error handling in listener services.John Spurlock2014-02-121-0/+9
* | | | | | Add support for injecting events into ActivityContainers.Jeff Brown2014-02-113-10/+43
* | | | | | 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
* | | | | | | | Merge "Move inputservice over to frameworks/native"Michael Wright2014-02-115-4/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Move inputservice over to frameworks/nativeMichael Wright2014-02-115-4/+8
* | | | | | | | | am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in C...Narayan Kamath2014-02-112-19/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrServ...Narayan Kamath2014-02-112-19/+19
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Use long to store pointers in ConsumerIrService"Narayan Kamath2014-02-112-19/+19
| | |\ \ \ \ \ \
| | | * | | | | | Use long to store pointers in ConsumerIrServiceAshok Bhat2014-02-072-19/+19
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | Fix build.Narayan Kamath2014-02-111-0/+1
* | | | | | | | am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Contex...Jeff Brown2014-02-1117-129/+100
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-...Jeff Brown2014-02-1117-129/+100
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge "Make SystemService constructor take a Context." into klp-modular-devJeff Brown2014-02-1117-129/+100
| | |\ \ \ \ \ \
| | | * | | | | | Make SystemService constructor take a Context.Jeff Brown2014-02-1017-129/+100
* | | | | | | | | 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
| | |/ / / / / /
* | | | | | | | Merge "Maybe fix issue #12957738: SecurityException in..."Dianne Hackborn2014-02-111-15/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Maybe fix issue #12957738: SecurityException in...Dianne Hackborn2014-02-101-15/+20
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Revert "Move inputservice over to frameworks/native""Michael Wright2014-02-104-7/+3
|\ \ \ \ \ \ \
| * | | | | | | Revert "Move inputservice over to frameworks/native"Michael Wright2014-02-104-7/+3
* | | | | | | | Merge "Move inputservice over to frameworks/native"Michael Wright2014-02-104-3/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Move inputservice over to frameworks/nativeMichael Wright2014-02-104-3/+7
* | | | | | | | Merge "Remove SkRegion dependency from libinput"Michael Wright2014-02-101-3/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Remove SkRegion dependency from libinputMichael Wright2014-02-101-3/+7
* | | | | | | | Fix NPE on removing a userAmith Yamasani2014-02-101-3/+4
| |/ / / / / / |/| | | | | |
* | | | | | | 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
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |