summaryrefslogtreecommitdiffstats
path: root/services/core/java
Commit message (Expand)AuthorAgeFilesLines
...
* | | am cf6e0d68: Merge "Add display synchronously." into klp-modular-devCraig Mautner2014-01-132-11/+9
|\ \ \ | |/ /
| * | Merge "Add display synchronously." into klp-modular-devCraig Mautner2014-01-132-11/+9
| |\ \
| | * | Add display synchronously.Craig Mautner2014-01-122-33/+17
| | |/
* | | am da9b87a7: am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix v...Craig Mautner2014-01-111-1/+1
|\ \ \ | |/ /
| * | am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of ...Craig Mautner2014-01-111-1/+1
* | | am d7c97a79: Merge "Remove misleading warnings." into klp-modular-devCraig Mautner2014-01-101-9/+0
|\ \ \ | |/ /
| * | Merge "Remove misleading warnings." into klp-modular-devCraig Mautner2014-01-101-9/+0
| |\ \
| | * | Remove misleading warnings.Craig Mautner2014-01-101-9/+0
| | |/
* | | am 93884a5b: Fix invalid stackId bug.Craig Mautner2014-01-101-22/+8
|\ \ \ | |/ /
| * | Fix invalid stackId bug.Craig Mautner2014-01-101-22/+8
| |/
* | resolved conflicts for merge of 4504de5d to masterCraig Mautner2014-01-103-22/+111
|\ \ | |/
| * Implement ActivityView.Craig Mautner2014-01-103-22/+109
* | am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-mod...Craig Mautner2014-01-101-2/+2
|\ \ | |/
| * Call moveHomeStack before moving any stack.Craig Mautner2014-01-101-2/+2
* | am b6d9eb87: Merge "Add flag to force public virtual display to show own cont...Jeff Brown2014-01-093-6/+19
|\ \ | |/
| * Merge "Add flag to force public virtual display to show own content." into kl...Jeff Brown2014-01-093-6/+19
| |\
| | * Add flag to force public virtual display to show own content.Jeff Brown2014-01-073-6/+19
* | | Merge "Revert "Revert "Move Wifi services to a new git project"""Vinit Deshpande2014-01-0817-16237/+4
|\ \ \
| * | | Revert "Revert "Move Wifi services to a new git project""Vinit Deshpande2014-01-0817-16237/+4
* | | | Merge "b/12068020 Make kb layouts only unique to vendor/product"RoboErik2014-01-081-48/+84
|\ \ \ \
| * | | | b/12068020 Make kb layouts only unique to vendor/productRoboErik2014-01-071-48/+84
* | | | | resolved conflicts for merge of 88bfc6dd to masterCraig Mautner2014-01-088-174/+273
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Extend stack management to other displays." into klp-modular-devCraig Mautner2014-01-088-174/+273
| |\ \ \ \
| | * | | | Extend stack management to other displays.Craig Mautner2014-01-068-174/+273
* | | | | | am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added...Mike Lockwood2014-01-082-28/+145
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB ...Mike Lockwood2014-01-082-28/+145
* | | | | | am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-devNarayan Kamath2014-01-084-31/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 92ae0347 to klp-modular-devNarayan Kamath2014-01-084-31/+31
| | |_|_|/ | |/| | |
* | | | | Merge "Revert "Move Wifi services to a new git project""Vinit Deshpande2014-01-0817-4/+16237
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Revert "Move Wifi services to a new git project"Vinit Deshpande2014-01-0817-4/+16237
* | | | | Merge "Move Wifi services to a new git project"Vinit Deshapnde2014-01-0817-16237/+4
|\ \ \ \ \ | |/ / / /
| * | | | Move Wifi services to a new git projectVinit Deshapnde2014-01-0717-16237/+4
* | | | | Don't just log this warning; record the situation for posterityChristopher Tate2014-01-071-2/+3
| |_|_|/ |/| | |
* | | | am 66e9b1e1: Merge "Move SystemService code to frameworks/base/core" into klp...Adam Lesinski2014-01-073-377/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Move SystemService code to frameworks/base/core" into klp-modular-devAdam Lesinski2014-01-073-377/+0
| |\ \
| | * | Move SystemService code to frameworks/base/coreAdam Lesinski2013-12-203-377/+0
* | | | am 107eb740: am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix b...Narayan Kamath2014-01-073-3/+19
|\ \ \ \ | |/ / /
| * | | am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML par...Narayan Kamath2014-01-073-3/+19
| * | | am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO N...Todd Poynor2014-01-062-42/+113
| | |/ | |/|
* | | Merge commit '817ec49e' into manualmergeAmith Yamasani2013-12-201-35/+20
|\ \ \ | |/ /
| * | Wrap some services into a SystemServiceAmith Yamasani2013-12-201-35/+20
| |/
* | Fix issue where gps "on" stats continue to run when gps is disabled.David Christie2013-12-191-0/+1
* | Merge "Move files to new directory structure of framework services"Amith Yamasani2013-12-1910-0/+13187
|\ \
| * | Move files to new directory structure of framework servicesAmith Yamasani2013-12-1910-0/+13187
| /
* | am 9158825f: Move some system services to separate directoriesAmith Yamasani2013-12-1969-1651/+2222
|/
* Move some system services to separate directoriesAmith Yamasani2013-12-19269-0/+169862