summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --ch...Dianne Hackborn2014-03-052-49/+124
|\
| * am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to pack...Dianne Hackborn2014-03-052-49/+124
| |\
| | * am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager d...Dianne Hackborn2014-03-052-49/+124
| | |\
| | | * Issue #13308712: Add --checkin to package manager dump.Dianne Hackborn2014-03-052-49/+124
* | | | am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buf...Robert Greenwalt2014-03-051-2/+2
|\ \ \ \ | |/ / /
| * | | am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for...Robert Greenwalt2014-03-051-2/+2
| |\ \ \ | | |/ /
| | * | am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net"...Robert Greenwalt2014-03-051-2/+2
| | |\ \ | | | |/
| | | * Merge "Only apply tcp buffer sizes for default net" into klp-devRobert Greenwalt2014-03-051-2/+2
| | | |\
| | | | * Only apply tcp buffer sizes for default netRobert Greenwalt2014-03-041-2/+2
* | | | | am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-devChristopher Tate2014-03-051-84/+169
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of c45ff35f to klp-modular-devChristopher Tate2014-03-051-84/+169
| |\ \ \ \ | | |/ / /
| | * | | am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 im...Christopher Tate2014-03-051-84/+170
| | |\ \ \ | | | |/ /
| | | * | Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-devChristopher Tate2014-03-051-84/+170
| | | |\ \
| | | | * | Adapt to underlying changes in the PBKDF2 implementationChristopher Tate2014-03-031-84/+170
| | | | |/
* | | | | am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMoni...Christopher Tate2014-03-051-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recogn...Christopher Tate2014-03-051-2/+2
| |\ \ \ \ | | |/ / /
| | * | | am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'rep...Christopher Tate2014-03-051-2/+2
| | |\ \ \ | | | |/ /
| | | * | Update PackageMonitor to recognize new 'replacing' semanticsChristopher Tate2014-03-031-2/+2
| | | |/
* | | | am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in creat...Craig Mautner2014-03-041-1/+2
|\ \ \ \
| * \ \ \ Merge "Avoid duplication of AppWindowToken in created Task"Craig Mautner2014-03-041-1/+2
| |\ \ \ \
| | * | | | Avoid duplication of AppWindowToken in created TaskYevgen Pronenko2014-03-041-1/+2
* | | | | | am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationMa...Will Haldean Brown2014-02-281-8/+24
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Maintain binding to crashed listeners from NotificationManagerService....Will Haldean Brown2014-02-281-8/+24
| |\ \ \ \ \
| | * | | | | Maintain binding to crashed listeners from NotificationManagerService.Will Haldean Brown2014-02-281-8/+24
* | | | | | | am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent.Jeff Brown2014-02-281-8/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make meaning of PowerManager.isScreenOn() more consistent.Jeff Brown2014-02-271-8/+9
| |/ / / / /
* | | | | | am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock applicatio...Christopher Tate2014-02-271-1/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Fixed upgrading from forward-lock application to system application"Christopher Tate2014-02-271-1/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fixed upgrading from forward-lock application to system applicationBrice Jaglin2014-02-181-1/+3
* | | | | | am dd9ce628: Merge "Clean up activities and displays when done" into klp-modu...Craig Mautner2014-02-256-42/+96
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Clean up activities and displays when done" into klp-modular-devCraig Mautner2014-02-256-42/+96
| |\ \ \ \ \
| | * | | | | Clean up activities and displays when doneCraig Mautner2014-02-256-42/+96
* | | | | | | am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: ...Mike Lockwood2014-02-251-6/+26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race cond...Mike Lockwood2014-02-251-6/+26
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition enterin...Mike Lockwood2014-02-251-6/+26
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | UsbDeviceManager: Fix race condition entering USB accessory modeMike Lockwood2014-02-191-6/+26
* | | | | | | am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modul...Jeff Brown2014-02-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix typo that causes dreaming on battery." into klp-modular-devJeff Brown2014-02-251-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix typo that causes dreaming on battery.Jeff Brown2014-02-241-1/+1
* | | | | | | | am f7f80d7b: Merge "Start the dream manager even if dreams are not supported....Jeff Brown2014-02-241-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Start the dream manager even if dreams are not supported." into klp-mo...Jeff Brown2014-02-241-3/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Start the dream manager even if dreams are not supported.Jeff Brown2014-02-241-3/+2
* | | | | | | | am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular...Craig Mautner2014-02-221-7/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fixes for ActivityView on home activity" into klp-modular-devCraig Mautner2014-02-221-7/+18
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Fixes for ActivityView on home activityCraig Mautner2014-02-211-7/+18
* | | | | | | | am f0f45452: Merge "Reset deferred task removal when app token added." into k...Craig Mautner2014-02-222-26/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Reset deferred task removal when app token added." into klp-modular-devCraig Mautner2014-02-222-26/+27
| |\ \ \ \ \ \ \
| | * | | | | | | Reset deferred task removal when app token added.Craig Mautner2014-02-212-26/+27
* | | | | | | | | resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aospGreg Hackmann2014-02-212-2/+96
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatalGreg Hackmann2014-02-211-7/+7