summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and display...Craig Mautner2014-02-256-42/+96
|\
| * 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 f2d07694: am 6eff9949: am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5:...Mike Lockwood2014-02-251-6/+26
|\ \ \ \ | |/ / /
| * | | 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 01d63a35: am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming o...Jeff Brown2014-02-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if...Jeff Brown2014-02-241-3/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | Merge "Improve how battery stats collects network stats."Dianne Hackborn2014-02-241-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Improve how battery stats collects network stats.Dianne Hackborn2014-02-241-2/+3
* | | | | | | | Remove unneeded new RIL command.Jake Hamby2014-02-241-4/+2
|/ / / / / / /
* | | | | | | Merge "Only allow System apps to make VPN exempt routes"Chad Brubaker2014-02-242-6/+84
|\ \ \ \ \ \ \
| * | | | | | | Only allow System apps to make VPN exempt routesChad Brubaker2014-02-212-6/+84
* | | | | | | | Merge "Add the calling package name to requestRouteToHost"Chad Brubaker2014-02-241-4/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add the calling package name to requestRouteToHostChad Brubaker2014-02-191-4/+5
* | | | | | | | Merge "Enables a profile owner or device owner to set and clear default inten...Sander Alewijnse2014-02-245-0/+381
|\ \ \ \ \ \ \ \
| * | | | | | | | Enables a profile owner or device owner to set and clear default intent handl...Sander Alewijnse2014-02-215-0/+381
* | | | | | | | | am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home ...Craig Mautner2014-02-221-7/+18
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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
* | | | | | | | | resolved conflicts for merge of d2794f5e to masterCraig Mautner2014-02-212-25/+27
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | | am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-mod...Greg Hackmann2014-02-222-2/+96
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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
| | * | | | | | | | | Move time setting code from SystemClock to AlarmManagerServiceGreg Hackmann2014-02-212-2/+96
* | | | | | | | | | | am 542b55d9: am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting ...Adam Lesinski2014-02-221-128/+121
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-devAdam Lesinski2014-02-211-128/+121
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Fix broken IME when decrypting storage" into klp-modular-devAdam Lesinski2014-02-211-128/+121
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fix broken IME when decrypting storageAdam Lesinski2014-02-211-128/+121
* | | | | | | | | | | Merge "add new accessibility action for EditText to set text content"Guang Zhu2014-02-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add new accessibility action for EditText to set text contentGuang Zhu2014-02-201-1/+2
* | | | | | | | | | | | Merge "ConnectivityService: add support to set TCP initial rwnd"JP Abgrall2014-02-211-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ConnectivityService: add support to set TCP initial rwndJP Abgrall2014-02-211-0/+9
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Check DeviceOwner exists before using packageName"Robin Lee2014-02-211-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Check DeviceOwner exists before using packageNameRobin Lee2014-02-201-3/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | am c72f5c2d: am ec5c3b90: am c2c0a61c: Add copyright notice to files missing ...Craig Mautner2014-02-216-4/+92
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am c2c0a61c: Add copyright notice to files missing them.Craig Mautner2014-02-216-4/+92
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |