summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-devHui Lu2014-01-311-0/+4
|\
| * Merge "Add proxy as another network." into klp-modular-devHui Lu2014-01-301-0/+4
| |\
| | * Add proxy as another network.Hui Lu2014-01-301-0/+4
| * | am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make grap...Narayan Kamath2014-01-282-11/+11
| |\ \
| | * \ am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes ...Narayan Kamath2014-01-282-11/+11
| | |\ \
| | | * \ am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat...Narayan Kamath2014-01-282-11/+11
| | | |\ \
| | | | * \ Merge "AArch64: Make graphics classes 64-bit compatible"Narayan Kamath2014-01-282-11/+11
| | | | |\ \
| | | | | * | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-282-11/+11
* | | | | | | Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"Brian Carlstrom2014-01-311-1/+1
|\ \ \ \ \ \ \
| * | | | | | | frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
* | | | | | | | Formatting fixPatrick Tjin2014-01-301-0/+1
|/ / / / / / /
* | | | | | | Merge "Adapt to underlying changes in the PBKDF2 implementation"Christopher Tate2014-01-291-84/+169
|\ \ \ \ \ \ \
| * | | | | | | Adapt to underlying changes in the PBKDF2 implementationChristopher Tate2014-01-161-84/+169
* | | | | | | | am af17925f: am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[Acti...Craig Mautner2014-01-281-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]:...Craig Mautner2014-01-281-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the acti...Craig Mautner2014-01-281-0/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibili...Craig Mautner2014-01-281-0/+1
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | [ActivityManager]: Fix the activity visibility state not sync between Activit...louis_chang2014-01-281-0/+1
| | | | | |/ / | | | | |/| |
* | | | | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-282-11/+11
* | | | | | | Merge "Update PackageMonitor to recognize new 'replacing' semantics"Christopher Tate2014-01-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Update PackageMonitor to recognize new 'replacing' semanticsChristopher Tate2014-01-271-2/+2
* | | | | | | | Merge "Clean up dhcp no-op logging"Robert Greenwalt2014-01-271-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Clean up dhcp no-op loggingRobert Greenwalt2014-01-231-3/+3
* | | | | | | | Revert "AArch64: Make graphics classes 64-bit compatible"Narayan Kamath2014-01-272-11/+11
* | | | | | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-272-11/+11
* | | | | | | | am 38eda9c4: Remove unnecessary logging.Craig Mautner2014-01-251-9/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Remove unnecessary logging.Craig Mautner2014-01-241-9/+0
* | | | | | | | Merge "Add app version codes to procstats."Dianne Hackborn2014-01-243-39/+54
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add app version codes to procstats.Dianne Hackborn2014-01-233-39/+54
* | | | | | | | am 222496f8: am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only ...Christopher Tate2014-01-231-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage ...Christopher Tate2014-01-231-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after...Christopher Tate2014-01-221-1/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete"Christopher Tate2014-01-221-1/+2
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "Only send storage intents after boot complete"Christopher Tate2014-01-221-1/+2
| | | | |\ \ \
| | | | | * | | Only send storage intents after boot completeJohan Redestig2014-01-181-1/+2
* | | | | | | | Merge "Battery stats improvements."Dianne Hackborn2014-01-224-21/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Battery stats improvements.Dianne Hackborn2014-01-224-21/+75
* | | | | | | | | am 46c95dfc: am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_...Christopher Tate2014-01-221-0/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED di...Christopher Tate2014-01-221-0/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if p...Christopher Tate2014-01-221-0/+6
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app...Christopher Tate2014-01-211-0/+6
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | FLAG_PRIVILEGED disappears if privileged app is updated and rebootedNaofumi Harada2014-01-211-0/+6
| | | | | |/ / | | | | |/| |
* | | | | | | am e2c9cd58: Merge "Refactor display manager service to new pattern." into kl...Jeff Brown2014-01-1821-714/+705
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Refactor display manager service to new pattern.Jeff Brown2014-01-1621-714/+705
* | | | | | Merge "Add --checkin to package manager dump."Dianne Hackborn2014-01-172-49/+124
|\ \ \ \ \ \
| * | | | | | Add --checkin to package manager dump.Dianne Hackborn2014-01-172-49/+124
* | | | | | | Merge "boot into recovery via the pre-recovery service"Doug Zongker2014-01-161-5/+24
|\ \ \ \ \ \ \
| * | | | | | | boot into recovery via the pre-recovery serviceDoug Zongker2014-01-161-5/+24
* | | | | | | | Fix build.Jeff Brown2014-01-161-2/+4
|/ / / / / / /
* | | | | | | resolved conflicts for merge of 6f357d32 to masterJeff Brown2014-01-1613-780/+879
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |