summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Proper security labeling of multi-user data directories.Robert Craig2013-09-183-3/+6
* Fix formatting in clearApplicationUserData exception message.Alex Klyubin2013-09-131-3/+3
* Make legacy VPN work over stacked interfaces.Lorenzo Colitti2013-07-311-6/+7
* 464xlat: use a gatewayed route, not point-to-pointLorenzo Colitti2013-07-311-6/+13
* am 53771e5f: Merge "Remove useless/repetitive code"Chet Haase2013-07-221-6/+4
|\
| * Remove useless/repetitive codeCyril Mottier2013-07-151-6/+4
* | am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s i...Wink Saville2013-07-121-4/+7
|\ \
| * \ Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb...Wink Saville2013-07-121-4/+7
| |\ \
| | * | VZW wants the phoneNumber to be 10 zero's if there isn't one.Wink Saville2013-07-101-4/+7
* | | | am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache req...Amith Yamasani2013-07-124-6/+15
|\ \ \ \ | |/ / /
| * | | Merge "Pass along the user id to AttributeCache requests" into jb-mr2-devAmith Yamasani2013-07-124-6/+15
| |\ \ \ | | |/ / | |/| |
| | * | Pass along the user id to AttributeCache requestsAmith Yamasani2013-07-104-6/+15
* | | | am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards""...Satoshi Kataoka2013-07-091-8/+5
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-devSatoshi Kataoka2013-07-091-8/+5
| |\ \ \
| | * | | Revert "Stop marking gamepads as keyboards"Ken Wakasa2013-07-051-8/+5
* | | | | am 57512008: am 8f793103: Merge "Set foreground priority for shutdown receive...Jean-Baptiste Queru2013-07-081-1/+3
|\ \ \ \ \
| * \ \ \ \ am 8f793103: Merge "Set foreground priority for shutdown receivers."Jean-Baptiste Queru2013-07-081-1/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Set foreground priority for shutdown receivers."Jean-Baptiste Queru2013-07-081-1/+3
| | |\ \ \ \
| | | * | | | Set foreground priority for shutdown receivers.Martin Wallgren2013-02-041-1/+3
* | | | | | | am e14afe71: am 58f26e9d: Merge "The order of child windows is switched"Jean-Baptiste Queru2013-07-081-1/+26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 58f26e9d: Merge "The order of child windows is switched"Jean-Baptiste Queru2013-07-081-1/+26
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | The order of child windows is switchedtakeda.masayuki2013-07-081-1/+26
* | | | | | | am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' ...Vinit Deshpande2013-07-032-9/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-devVinit Deshpande2013-07-032-9/+2
| |\ \ \ \ \ \
| | * | | | | | Revert "Temporarily disable 'Scan Always' mode"Vinit Deshpande2013-07-032-9/+2
* | | | | | | | am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in check...Wink Saville2013-07-021-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into ...Wink Saville2013-07-021-0/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Fix NPE if mobile is not supported in checkMobileProvisioning.Wink Saville2013-07-021-0/+10
* | | | | | | | | am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" in...Vinit Deshapnde2013-07-012-2/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Temporarily disable 'Scan Always' mode" into jb-mr2-devVinit Deshapnde2013-07-022-2/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Temporarily disable 'Scan Always' modeVinit Deshapnde2013-07-012-2/+9
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityS...Wink Saville2013-07-011-3/+509
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-devWink Saville2013-07-011-3/+509
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add checkMobileProvisioning to ConnectivityService.Wink Saville2013-06-291-3/+509
* | | | | | | resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aospElliott Hughes2013-06-282-9/+9
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | resolved conflicts for merge of fca0f92e to stage-aosp-masterElliott Hughes2013-06-282-9/+9
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Switch frameworks/base over from @hidden Charsets to public StandardCharsets.Elliott Hughes2013-06-282-9/+9
* | | | | | | am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb...Robert Greenwalt2013-06-261-55/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Fix power issues around wifi scans." into jb-mr2-devRobert Greenwalt2013-06-261-55/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix power issues around wifi scans.Robert Greenwalt2013-06-261-55/+1
* | | | | | | am a0b9e1ee: am 99e4a0f5: Merge "Improper initialization of the accessibility...Svetoslav2013-06-251-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Improper initialization of the accessibility manager service.Svetoslav2013-06-211-0/+9
| |/ / / / /
* | | | | | am 34718238: am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated...Christopher Tate2013-06-241-3/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"Christopher Tate2013-06-241-3/+6
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Avoid adding FORWARD_LOCK flag to an updated system app"Christopher Tate2013-06-241-3/+6
| | |\ \ \ \
| | | * | | | Avoid adding FORWARD_LOCK flag to an updated system appMasanori Ogino2012-05-071-3/+6
* | | | | | | am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notification...Daniel Sandler2013-06-141-2/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Temporarily restore some support for icon==0 notifications." into jb-m...Daniel Sandler2013-06-141-2/+4
| |\ \ \ \ \ \
| | * | | | | | Temporarily restore some support for icon==0 notifications.Daniel Sandler2013-05-221-2/+4
* | | | | | | | am a37c3f18: Merge "Fix logspam when battery sysfs file not available." into ...Jeff Brown2013-06-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /