summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am e88097bd: Merge "Pause and resume ActivityView when visibility changes" in...Craig Mautner2014-05-051-3/+8
|\
| * Merge "Pause and resume ActivityView when visibility changes" into klp-modula...Craig Mautner2014-05-051-3/+8
| |\
| | * Pause and resume ActivityView when visibility changesCraig Mautner2014-05-051-3/+8
* | | am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular...Craig Mautner2014-05-051-1/+1
|\ \ \ | |/ /
| * | Add null check to embeddedAllowed checkCraig Mautner2014-05-051-1/+1
| |/
* | am 7f6ab17d: Merge "Clean up some terminology related to interactive state." ...Jeff Brown2014-05-011-2/+2
|\ \ | |/
| * Clean up some terminology related to interactive state.Jeff Brown2014-05-011-2/+2
* | am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"Brian Carlstrom2014-05-011-130/+132
|\ \
| * \ am 0f7c0570: Merge "Minor cleanup of UsageStatsService"Brian Carlstrom2014-05-011-130/+132
| |\ \
| | * | Minor cleanup of UsageStatsServiceBrian Carlstrom2014-05-011-130/+132
* | | | am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is n...Narayan Kamath2014-05-011-6/+7
|\ \ \ \ | |/ / /
| * | | am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."Narayan Kamath2014-05-011-6/+7
| |\ \ \ | | |/ /
| | * | Don't adjust ABI if PackageSetting#pkg is null.Narayan Kamath2014-05-011-6/+7
* | | | am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."Narayan Kamath2014-05-011-18/+32
|\ \ \ \ | |/ / /
| * | | am 27f2bfc4: Merge "Fix dex file pruning logic."Narayan Kamath2014-05-011-18/+32
| |\ \ \ | | |/ /
| | * | Fix dex file pruning logic.Narayan Kamath2014-05-011-18/+32
* | | | am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."Narayan Kamath2014-05-012-0/+66
|\ \ \ \ | |/ / /
| * | | am bcc3b312: Merge "Adjust instruction sets for shared UID apps."Narayan Kamath2014-05-012-0/+66
| |\ \ \ | | |/ /
| | * | Adjust instruction sets for shared UID apps.Narayan Kamath2014-05-012-0/+66
* | | | resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aospNarayan Kamath2014-05-012-98/+251
|\ \ \ \ | |/ / /
| * | | am 2a9a0471: Merge "Package manager changes for dual zygote stack."Narayan Kamath2014-05-012-98/+251
| |\ \ \ | | |/ /
| | * | Package manager changes for dual zygote stack.Narayan Kamath2014-05-012-98/+251
* | | | am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."Narayan Kamath2014-05-011-1/+1
|\ \ \ \ | |/ / /
| * | | am 645a920f: Merge "Fix OEM native library path bug."Narayan Kamath2014-05-011-1/+1
| |\ \ \ | | |/ /
| | * | Fix OEM native library path bug.Jeff Sharkey2014-05-011-1/+1
* | | | am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"Narayan Kamath2014-05-011-4/+4
|\ \ \ \ | |/ / /
| * | | am 986b901a: Merge "Fix native-lib dir assignment & updating"Narayan Kamath2014-05-011-4/+4
| |\ \ \ | | |/ /
| | * | Fix native-lib dir assignment & updatingChristopher Tate2014-05-011-4/+4
* | | | am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"Narayan Kamath2014-05-011-15/+45
|\ \ \ \ | |/ / /
| * | | am fde59428: Merge "Handle /oem and /vendor as well"Narayan Kamath2014-05-011-15/+45
| |\ \ \ | | |/ /
| | * | Handle /oem and /vendor as wellChristopher Tate2014-05-011-15/+45
* | | | am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"Narayan Kamath2014-05-011-3/+29
|\ \ \ \ | |/ / /
| * | | am d91358b2: Merge "Support per-package lib dirs for bundled apps"Narayan Kamath2014-05-011-3/+29
| |\ \ \ | | |/ /
| | * | Support per-package lib dirs for bundled appsNarayan Kamath2014-05-011-3/+29
| * | | am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrus...Michael Wright2014-04-302-0/+2
| |\ \ \ | | |/ /
| | * | Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"Michael Wright2014-04-292-0/+2
| | |\ \
| | | * | Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()Zach Swasey2014-04-212-0/+2
| * | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-2932-541/+1215
| |\ \ \ \
| | * \ \ \ am 9bbd2f97: am 2cacc619: Merge "Don\'t wait for finishing animation when sec...Craig Mautner2014-03-251-2/+7
| | |\ \ \ \
| | * \ \ \ \ am ca903d38: am 81e094d7: Merge "Move task to top in window manager." into kl...Craig Mautner2014-03-251-0/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on resc...Matthew Williams2014-03-245-33/+38
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure c...Craig Mautner2014-03-242-4/+22
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into ...Chad Brubaker2014-03-211-26/+51
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceF...Chad Brubaker2014-03-212-3/+3
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race cond...Mike Lockwood2014-03-211-1/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition...Mike Lockwood2014-03-211-25/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched...Jim Miller2014-03-201-10/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am dd6b7495: am 83725810: Merge "Get rid of noise during boot."Nick Kralevich2014-03-201-5/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-devCraig Mautner2014-03-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /d...Nick Kralevich2014-03-193-0/+108
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \