summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Fix a bug on SwitchToLastInputMethodsatok2011-05-201-1/+1
* Fix switchToLastInputMethod to fall back into the applicable keyboard if ther...satok2011-05-201-18/+57
* resolved conflicts for merge of 06a8ceac to masterDianne Hackborn2011-05-191-11/+39
|\
| * am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-11/+39
| |\
| | * am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-11/+39
| | |\
| | | * Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-11/+39
* | | | Merge "Fix a race that could cause GL commands to be executed from the wrong ...Mathias Agopian2011-05-196-108/+79
|\ \ \ \
| * | | | Fix a race that could cause GL commands to be executed from the wrong thread.Mathias Agopian2011-05-196-108/+79
* | | | | Merge "TouchExplorer - refactoring and a couple of bug fixes"Svetoslav Ganov2011-05-191-157/+76
|\ \ \ \ \
| * | | | | TouchExplorer - refactoring and a couple of bug fixesSvetoslav Ganov2011-05-191-157/+76
* | | | | | Merge "Fix a crasher in SensorService"Mathias Agopian2011-05-191-2/+1
|\ \ \ \ \ \
| * | | | | | Fix a crasher in SensorServiceMathias Agopian2011-05-191-2/+1
| | |/ / / / | |/| | | |
* | | | | | Merge "Code cleanup."Romain Guy2011-05-191-18/+7
|\ \ \ \ \ \
| * | | | | | Code cleanup.Romain Guy2011-05-191-18/+7
* | | | | | | am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to ...Irfan Sheriff2011-05-191-45/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigSto...Irfan Sheriff2011-05-191-45/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into hone...Irfan Sheriff2011-05-191-45/+6
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2Irfan Sheriff2011-05-191-45/+6
| | | |\ \ \ \
| | | | * | | | Move softap config handling to WifiConfigStoreIrfan Sheriff2011-05-181-45/+6
* | | | | | | | resolved conflicts for merge of b2d0ee16 to masterKenny Root2011-05-191-42/+93
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | resolved conflicts for merge of 2433c443 to honeycomb-plus-aospKenny Root2011-05-191-45/+95
| |\ \ \ \ \ \
| | * \ \ \ \ \ am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbreadKenny Root2011-05-191-45/+95
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Break apart queries to getInstalled* API" into gingerbreadKenny Root2011-05-191-45/+95
| | | |\ \ \ \ \ \
| | | | * | | | | | Break apart queries to getInstalled* APIKenny Root2011-04-191-45/+95
* | | | | | | | | | Merge c41aefe1Jean-Baptiste Queru2011-05-192-20/+219
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 59b1a4ed: Switch to use netd to add/remove routes.Robert Greenwalt2011-05-182-20/+223
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Switch to use netd to add/remove routes.Robert Greenwalt2011-05-182-20/+223
* | | | | | | | | | am ba8fc5b0: am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rota...Dianne Hackborn2011-05-191-2/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into ho...Dianne Hackborn2011-05-181-2/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2Dianne Hackborn2011-05-181-2/+16
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Fix fake display size when rotated.Dianne Hackborn2011-05-181-2/+16
* | | | | | | | | | am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state cha...Kazuhiro Ondo2011-05-182-7/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 01758e81: Linkproperties update via unsol data call state change.Kazuhiro Ondo2011-05-182-7/+38
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Linkproperties update via unsol data call state change.Kazuhiro Ondo2011-05-172-7/+38
* | | | | | | | | | am 4f9bb17f: am c2db2144: am a429d5df: Merge "Improve compat mode scaling imp...Dianne Hackborn2011-05-185-281/+149
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation."...Dianne Hackborn2011-05-175-281/+149
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am a429d5df: Merge "Improve compat mode scaling implementation." into honeyco...Dianne Hackborn2011-05-175-281/+149
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Improve compat mode scaling implementation." into honeycomb-mr2Dianne Hackborn2011-05-175-281/+149
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Improve compat mode scaling implementation.Dianne Hackborn2011-05-175-281/+149
| | | | | |_|_|/ / / | | | | |/| | | | |
* | | | | | | | | | am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId...Mike Lockwood2011-05-181-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ...Mike Lockwood2011-05-171-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycom...Mike Lockwood2011-05-171-0/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | StorageVolume: Add getStorageId() accessorMike Lockwood2011-05-171-0/+5
| | | |/ / / / /
* | | | | | | | Merge "SurfaceFlinger: unfreeze windows for fixed size buffers."Jamie Gennis2011-05-171-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | SurfaceFlinger: unfreeze windows for fixed size buffers.Jamie Gennis2011-05-161-2/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "First pass at NetworkPolicy and activity tracking."Jeff Sharkey2011-05-173-36/+257
|\ \ \ \ \ \ \ \
| * | | | | | | | First pass at NetworkPolicy and activity tracking.Jeff Sharkey2011-05-133-36/+257
* | | | | | | | | am b68c768d: am 41744836: am 7916ac65: Add new command line option to change ...Dianne Hackborn2011-05-163-95/+308
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 41744836: am 7916ac65: Add new command line option to change global screen...Dianne Hackborn2011-05-163-95/+308
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 7916ac65: Add new command line option to change global screen size.Dianne Hackborn2011-05-163-95/+308
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |