summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 27725e8c: Only leave one default network up at a time.Robert Greenwalt2011-04-041-0/+1
|\
| * Only leave one default network up at a time.Robert Greenwalt2011-03-291-0/+1
* | am e558a000: Merge "Avoid crash in system server when mounting container"Brad Fitzpatrick2011-04-041-1/+2
|\ \
| * | Avoid crash in system server when mounting containerFredrik Helmer2011-04-041-1/+2
* | | am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into ...Irfan Sheriff2011-03-301-4/+4
|\ \ \ | | |/ | |/|
| * | Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbreadIrfan Sheriff2011-03-251-4/+4
| |\ \
| | * | DO NOT MERGE Pick upstream intf with valid IP confIrfan Sheriff2011-03-251-4/+4
* | | | am 568845a7: Merge "Fix some alt-network issues." into gingerbreadRobert Greenwalt2011-03-301-12/+11
|\ \ \ \ | |/ / /
| * | | Fix some alt-network issues.Robert Greenwalt2011-03-251-12/+11
* | | | am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Unregister callback from binder when vibration is removedMathias Jeppsson2011-03-241-0/+12
* | | | am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory ...Mike Lockwood2011-03-201-27/+75
|\ \ \ \ | | |/ / | |/| |
| * | | DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as t...Mike Lockwood2011-03-191-27/+75
* | | | am 5982bf66: GPS: Restore XTRA downloading at boot.Mike Lockwood2011-03-171-1/+1
|\ \ \ \ | |/ / /
| * | | GPS: Restore XTRA downloading at boot.Mike Lockwood2011-03-171-1/+1
* | | | am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbreadDianne Hackborn2011-03-151-2/+3
|\ \ \ \ | |/ / /
| * | | Merge "Improve error reporting for issue #3183612" into gingerbreadDianne Hackborn2011-03-151-2/+3
| |\ \ \
| | * | | Improve error reporting for issue #3183612Dianne Hackborn2011-03-151-2/+3
* | | | | am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from ho...Mike Lockwood2011-03-152-7/+17
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGE: Backport more USB accessory changes from honeycombMike Lockwood2011-03-152-7/+17
* | | | | am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from ...Mike Lockwood2011-03-144-253/+276
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGE: backport recent USB accessory changes from honeycombMike Lockwood2011-03-114-253/+276
| |/ / /
* | | | am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gin...Robert Greenwalt2011-03-111-50/+17
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE Backport of I1f55df8a from master.Robert Greenwalt2011-03-101-50/+17
* | | | am 4bdab175: DO NOT MERGE WiMAX supportTK MUN2011-03-091-5/+107
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE WiMAX supportTK MUN2011-03-091-5/+107
* | | | am 33029221: Merge "revert the surface purgatory list and dependent changes."...Mathias Agopian2011-03-097-87/+18
|\ \ \ \ | |/ / /
| * | | revert the surface purgatory list and dependent changes.Mathias Agopian2011-03-097-87/+18
* | | | am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (l...Mathias Agopian2011-03-076-17/+28
|\ \ \ \ | |/ / /
| * | | Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) onlyMathias Agopian2011-03-076-17/+28
| | |/ | |/|
* | | am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if ther...Mike Lockwood2011-03-021-1/+4
|\ \ \ | |/ /
| * | DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps ...Mike Lockwood2011-03-021-1/+4
* | | am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory fun...Mike Lockwood2011-03-021-29/+20
|\ \ \ | |/ /
| * | DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled wh...Mike Lockwood2011-03-021-29/+20
* | | am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-028-246/+1183
|\ \ \ | |/ /
| * | DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-018-246/+1183
* | | am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NO...Mike Lockwood2011-02-281-4/+9
|\ \ \ | |/ /
| * | UsbService: Remove stack-trace message during boot. DO NOT MERGEDavid 'Digit' Turner2011-02-271-4/+9
* | | am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbreadMike Lockwood2011-02-283-67/+70
|\ \ \ | |/ /
| * | DO NOT MERGE: Clean up USB notifications:Mike Lockwood2011-02-273-67/+70
* | | am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into ginger...Mike Lockwood2011-02-287-68/+110
|\ \ \ | |/ /
| * | DO NOT MERGE UsbManager: squashed commit of:Mike Lockwood2011-02-277-68/+110
* | | am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
|\ \ \ | | |/ | |/|
| * | am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
| |\ \
| | * | GpsLocationProvider: Clean up HAL initialization/cleanup sequenceMike Lockwood2011-02-231-141/+83
* | | | am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into g...Jamie Gennis2011-02-271-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbreadJamie Gennis2011-02-271-1/+1
| |\ \ \
| | * | | Prevent SurfaceFlinger from using layer token 31.Jamie Gennis2011-02-101-1/+1
* | | | | am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gi...Robert Greenwalt2011-02-161-44/+17
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | DO NOT MERGE - backport of l92a02b31 from masterRobert Greenwalt2011-02-111-44/+17