summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-...Dianne Hackborn2015-10-223-12/+46
|\
| * Hopefully fix issue #25153459: Sandboxed_process1 thrashingDianne Hackborn2015-10-213-12/+46
* | Merge "Maintain shared user list on OTA" into mnc-dr-devTodd Kennedy2015-10-211-1/+12
|\ \ | |/
| * Merge "Maintain shared user list on OTA" into mnc-dr-devTodd Kennedy2015-10-211-1/+12
| |\
| | * Maintain shared user list on OTATodd Kennedy2015-10-211-1/+12
* | | Narrow permission re-granting to specific volume.Jeff Sharkey2015-10-211-10/+39
|\ \ \ | |/ /
| * | Narrow permission re-granting to specific volume.Jeff Sharkey2015-10-211-10/+39
| |/
* | Merge "Watch dialer should have phone permission fixed" into cw-e-devAnthony Hugh2015-10-211-1/+4
|\ \
| * | Watch dialer should have phone permission fixedAnthony Hugh2015-10-211-1/+4
* | | Merge "Don\'t include password on default encryption command" into mnc-dr-devPaul Lawrence2015-10-211-2/+7
|\ \ \ | | |/ | |/|
| * | Merge "Don't include password on default encryption command" into mnc-dr-devPaul Lawrence2015-10-211-2/+7
| |\ \
| | * | Don't include password on default encryption commandPaul Lawrence2015-09-091-2/+7
* | | | Merge "Don\'t buzz when automatically connecting to captive portals" into mnc...Lorenzo Colitti2015-10-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Don't buzz when automatically connecting to captive portals" into mnc-...Lorenzo Colitti2015-10-211-1/+1
| |\ \ \
| | * | | Don't buzz when automatically connecting to captive portalsLorenzo Colitti2015-10-211-1/+1
* | | | | Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-devJeff Sharkey2015-10-211-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-devJeff Sharkey2015-10-211-4/+4
| |\ \ \ \
| | * | | | Correctly derive ABI for apps on adopted media.Jeff Sharkey2015-10-201-4/+4
* | | | | | Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-devRob Carr2015-10-201-2/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-devRob Carr2015-10-201-2/+7
| |\ \ \ \ \
| | * | | | | Catch exceptions thrown by pending activity launches.Robert Carr2015-10-201-2/+7
* | | | | | | Merge "ignore initial request to disable iptable chain" into mnc-dr-devKevin Cernekee2015-10-202-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "ignore initial request to disable iptable chain" into mnc-dr-devKevin Cernekee2015-10-202-6/+6
| |\ \ \ \ \ \
| | * | | | | | ignore initial request to disable iptable chainXiaohui Chen2015-10-202-6/+6
* | | | | | | | Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-devMatthew Williams2015-10-202-10/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | DO NOT MERGE Race condition in JobServiceContextMatthew Williams2015-10-202-10/+33
| | |/ / / / / | |/| | | | |
* | | | | | | DO NOT MERGE Sync extras bundle comparison can throw NPEMatthew Williams2015-10-202-2/+66
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE Sync extras bundle comparison can throw NPEMatthew Williams2015-10-202-2/+66
| |/ / / / /
* | | | | | resolve merge conflicts of 57a5cba606 to cw-e-dev.Michael Wright2015-10-201-2/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-devMichael Wright2015-10-201-2/+11
| |\ \ \ \
| | * | | | Add SystemUI component to watch for keyboard attachment.Michael Wright2015-10-121-2/+11
* | | | | | am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.Matthew Williams2015-10-164-11/+78
|\ \ \ \ \ \ | |/ / / / /
| * | | | | DO NOT MERGE Sanity check loaded periodics and cap runtime.Matthew Williams2015-10-164-11/+78
* | | | | | am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs ...Matthew Williams2015-10-161-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | DO NOT MERGE Change scheduling logic to run network jobs soonerMatthew Williams2015-10-151-2/+2
| | |/ / / | |/| | |
* | | | | am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mod...Dianne Hackborn2015-10-151-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix issue #24571425: Device does not come out of idle mode for mainten...Dianne Hackborn2015-10-151-3/+3
| |\ \ \ \
| | * | | | Fix issue #24571425: Device does not come out of idle mode for maintenanceDianne Hackborn2015-10-151-3/+3
* | | | | | am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." in...Rob Carr2015-10-151-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-devRob Carr2015-10-151-1/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | WindowStateAnimation: Clear transformation clip rect.Robert Carr2015-10-151-1/+2
* | | | | | am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted....Chris Thornton2015-10-151-4/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-devChris Thornton2015-10-151-4/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Don't call StopRecognition when recognition was aborted.Chris Thornton2015-10-071-4/+11
* | | | | | am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is confi...Erik Kline2015-10-141-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't crash if an invalid always-on VPN profile is configured." into m...Erik Kline2015-10-141-0/+5
| |\ \ \ \ \
| | * | | | | Don't crash if an invalid always-on VPN profile is configured.Lorenzo Colitti2015-10-131-0/+5
| | | |_|/ / | | |/| | |
* | | | | | am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-devMatthew Williams2015-10-142-8/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Correctly reschedule failed periodic" into mnc-dr-devMatthew Williams2015-10-142-8/+17
| |\ \ \ \ \
| | * | | | | Correctly reschedule failed periodicMatthew Williams2015-10-072-8/+17