summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Move inputservice over to frameworks/nativeMichael Wright2014-02-104-3/+7
* Remove SkRegion dependency from libinputMichael Wright2014-02-101-3/+7
* Merge "Improve logging of first wake lock, history size."Dianne Hackborn2014-02-064-70/+145
|\
| * Improve logging of first wake lock, history size.Dianne Hackborn2014-02-054-70/+145
* | Merge "Add new RIL commands to read/write NV items and reset NV config."Jake Hamby2014-02-051-6/+11
|\ \
| * | Add new RIL commands to read/write NV items and reset NV config.Jake Hamby2014-02-031-6/+11
| |/
* | resolved conflicts for merge of 32360147 to masterCraig Mautner2014-02-0413-209/+400
|\ \ | |/ |/|
| * am df88d730: Add IIntentSender to ActivityContainer.startActivityCraig Mautner2014-02-0413-209/+400
| |\
| | * Add IIntentSender to ActivityContainer.startActivityCraig Mautner2014-02-0413-209/+400
| * | resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aospNarayan Kamath2014-01-311-1/+1
| |\ \ | | |/ | |/|
| | * frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
* | | Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"Christopher Tate2014-02-033-83/+624
|\ \ \
| * | | Introduce "IdleService" API to expose idle-time maintenance to appsChristopher Tate2014-01-313-83/+624
* | | | 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