summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Allow enabling TDLS on specific routesVinit Deshapnde2013-07-111-0/+93
* Merge "Clean up any restrictions files that shouldn't be there."Amith Yamasani2013-07-091-0/+25
|\
| * Clean up any restrictions files that shouldn't be there.Amith Yamasani2013-07-091-0/+25
* | Merge "Consolidate InputMethodUtils"Satoshi Kataoka2013-07-091-10/+3
|\ \
| * | Consolidate InputMethodUtilsSatoshi Kataoka2013-07-091-10/+3
* | | More procstats work.Dianne Hackborn2013-07-083-124/+340
* | | Merge "KeySetManager: change KEYSET_NOT_FOUND to public"Kenny Root2013-07-081-1/+4
|\ \ \
| * | | KeySetManager: change KEYSET_NOT_FOUND to publicKenny Root2013-07-081-1/+4
* | | | am 58d52298: am 57512008: am 8f793103: Merge "Set foreground priority for shu...Jean-Baptiste Queru2013-07-081-1/+3
|\ \ \ \
| * \ \ \ 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
* | | | | | | | Merge "Move mLaunchingActivity from stack to supervisor."Craig Mautner2013-07-083-125/+108
|\ \ \ \ \ \ \ \
| * | | | | | | | Move mLaunchingActivity from stack to supervisor.Craig Mautner2013-07-053-125/+108
* | | | | | | | | am a998fa2d: am e14afe71: am 58f26e9d: Merge "The order of child windows is s...Jean-Baptiste Queru2013-07-081-1/+26
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 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
* | | | | | | | | Fix build.Ying Wang2013-07-081-2/+2
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge "KeySetManager: add keyset aliases to dump"Kenny Root2013-07-081-2/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | KeySetManager: add keyset aliases to dumpKenny Root2013-07-031-2/+17
* | | | | | | | Add traces for app launch / fully drawn times.Dianne Hackborn2013-07-032-2/+21
* | | | | | | | Merge "Improve how procstats history/checkins are managed."Dianne Hackborn2013-07-032-152/+401
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve how procstats history/checkins are managed.Dianne Hackborn2013-07-032-152/+401
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | am 6ea2faf8: am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'S...Vinit Deshpande2013-07-032-9/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | | | | | | | | Add dumpsys of recent wakeup patterns, for analysisChristopher Tate2013-07-021-2/+75
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | am c880ae16: am db011499: am 753d754c: Merge "Fix NPE if mobile is not suppo...Wink Saville2013-07-021-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
* | | | | | | | | Merge "KeySetManager: iterate over correct list"Kenny Root2013-07-021-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | KeySetManager: iterate over correct listKenny Root2013-07-021-1/+1
* | | | | | | | | Merge "Misc memory stuff."Dianne Hackborn2013-07-028-138/+424
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Misc memory stuff.Dianne Hackborn2013-07-028-138/+424
* | | | | | | | | Merge "Move input library code to frameworks/native."Jeff Brown2013-07-0213-26/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move input library code to frameworks/native.Jeff Brown2013-07-0113-26/+29
* | | | | | | | | | am 892b52f1: am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Alwa...Vinit Deshapnde2013-07-012-2/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
* | | | | | | | | Merge commit '3b5d686e' into fix-merge-conflictWink Saville2013-07-011-3/+508
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | 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
* | | | | | | | Merge "Fix issue #9611000: Random run-time restarts"Dianne Hackborn2013-07-011-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issue #9611000: Random run-time restartsDianne Hackborn2013-07-011-1/+0
| | |_|_|/ / / / | |/| | | | | |