summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-...Jinsuk Kim2014-12-174-12/+13
|\
| * Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-devJinsuk Kim2014-12-174-12/+13
| |\
| | * CEC: Pass port ID for set_audio_return_channelJinsuk Kim2014-12-174-12/+13
* | | am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 180...Cheuksan Wang2014-12-171-3/+3
|\ \ \ | |/ /
| * | Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into l...Cheuksan Wang2014-12-171-3/+3
| |\ \
| | * | remove actions and calls for the old sms/mms apiCheuksan Wang2014-12-161-3/+3
* | | | am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp...John Spurlock2014-12-172-27/+31
|\ \ \ \ | |/ / /
| * | | Audio policy: Fix deprecated shouldVibrate api.John Spurlock2014-12-172-27/+31
* | | | am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default ...Paul Jensen2014-12-171-19/+14
|\ \ \ \ | |/ / /
| * | | Merge "Fix race between CONNECTIVITY_ACTION and setting default network." int...Paul Jensen2014-12-171-19/+14
| |\ \ \ | | |_|/ | |/| |
| | * | Fix race between CONNECTIVITY_ACTION and setting default network.Paul Jensen2014-12-151-19/+14
* | | | am 0dab4dc0: Fix bad alarm deliveryChristopher Tate2014-12-161-62/+22
|\ \ \ \ | |/ / /
| * | | Fix bad alarm deliveryChristopher Tate2014-12-161-62/+22
| | |/ | |/|
* | | am a00be9b4: Remember failed dexopt to avoid retryBrian Carlstrom2014-12-161-1/+14
|\ \ \ | |/ /
| * | Remember failed dexopt to avoid retryBrian Carlstrom2014-12-151-1/+14
| |/
* | am 90c0ae63: Merge "Check which file changed before requesting backup" into l...Christopher Tate2014-12-131-6/+10
|\ \ | |/
| * Merge "Check which file changed before requesting backup" into lmp-mr1-devChristopher Tate2014-12-131-6/+10
| |\
| | * Check which file changed before requesting backupAmith Yamasani2014-12-131-6/+10
* | | am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-devSvet Ganov2014-12-121-0/+3
|\ \ \ | |/ /
| * | Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-devSvet Ganov2014-12-121-0/+3
| |\ \
| | * | Fix a NPE in AccessiiblityManagerService.Svet Ganov2014-12-111-0/+3
* | | | am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isVal...Wink Saville2014-12-121-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptio...Wink Saville2014-12-121-1/+1
| |\ \ \
| | * | | Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.Wink Saville2014-12-111-1/+1
* | | | | am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into...Craig Mautner2014-12-111-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Don't apply animations to windows that are showing" into lmp-mr1-devCraig Mautner2014-12-111-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Don't apply animations to windows that are showingCraig Mautner2014-12-111-1/+2
* | | | | am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume c...John Spurlock2014-12-111-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into...John Spurlock2014-12-111-1/+4
| |\ \ \ \
| | * | | | Zen: Leave zen=none on manual ringer mode stream volume changes.John Spurlock2014-12-111-1/+4
* | | | | | am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-devNarayan Kamath2014-12-111-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Avoid tearing down process groups twice." into lmp-mr1-devNarayan Kamath2014-12-111-3/+5
| |\ \ \ \ \
| | * | | | | Avoid tearing down process groups twice.Narayan Kamath2014-12-101-3/+5
* | | | | | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-111-2/+48
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-devPaul Jensen2014-12-111-2/+48
| |\ \ \ \ \ \
| | * | | | | | Fix several HTTP proxy issues with multinetworking.Paul Jensen2014-12-101-2/+48
| | | |_|_|/ / | | |/| | | |
* | | | | | | am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into l...Amith Yamasani2014-12-101-0/+25
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-devAmith Yamasani2014-12-101-0/+25
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Stop guest user on exiting, to conserve resourcesAmith Yamasani2014-12-101-0/+25
| | | |_|_|/ | | |/| | |
* | | | | | am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" int...Dianne Hackborn2014-12-101-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-devDianne Hackborn2014-12-101-1/+1
| |\ \ \ \ \
| | * | | | | Fix issue #18683980: questions on LMK memory changesDianne Hackborn2014-12-101-1/+1
| | | |_|/ / | | |/| | |
* | | | | | am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr...Jason Monk2014-12-101-16/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Handle policy change while keyguard disabled" into lmp-mr1-devJason Monk2014-12-101-16/+29
| |\ \ \ \ \
| | * | | | | Handle policy change while keyguard disabledJason Monk2014-12-091-16/+29
* | | | | | | am a96ba381: Merge "Only add successfully bound profile services to mProfileS...Benjamin Franz2014-12-101-14/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Only add successfully bound profile services to mProfileServices." int...Benjamin Franz2014-12-101-14/+17
| |\ \ \ \ \ \
| | * | | | | | Only add successfully bound profile services to mProfileServices.Benjamin Franz2014-12-101-14/+17
| | | |_|/ / / | | |/| | | |
* | | | | | | am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s int...Svet Ganov2014-12-101-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Ignore accessibility overlay when computing window's interactive regio...Svet Ganov2014-12-101-2/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |