summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-101-0/+12
* Add expiration update and keys change eventsJeff Tinker2015-04-092-5/+61
* am 8571e647: am 997eb5dd: am 44a38d93: Merge "Start accepting volume UUIDs fr...Jeff Sharkey2015-04-093-31/+38
|\
| * am 997eb5dd: am 44a38d93: Merge "Start accepting volume UUIDs from framework."Jeff Sharkey2015-04-093-31/+38
| |\
| | * am 44a38d93: Merge "Start accepting volume UUIDs from framework."Jeff Sharkey2015-04-093-31/+38
| | |\
| | | * Merge "Start accepting volume UUIDs from framework."Jeff Sharkey2015-04-093-31/+38
| | | |\
| | | | * Start accepting volume UUIDs from framework.Jeff Sharkey2015-04-093-31/+38
| | | |/
* | | | am ad6f4996: am 25327881: am 066fadb9: Merge "More volume UUID awareness."Jeff Sharkey2015-04-097-148/+115
|\ \ \ \ | |/ / /
| * | | am 25327881: am 066fadb9: Merge "More volume UUID awareness."Jeff Sharkey2015-04-097-148/+115
| |\ \ \ | | |/ /
| | * | am 066fadb9: Merge "More volume UUID awareness."Jeff Sharkey2015-04-097-148/+115
| | |\ \ | | | |/
| | | * Merge "More volume UUID awareness."Jeff Sharkey2015-04-097-148/+115
| | | |\
| | | | * More volume UUID awareness.Jeff Sharkey2015-04-097-148/+115
| | | |/
* | | | am 6930a29a: am cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"Andreas Gampe2015-04-091-5/+2
|\ \ \ \ | |/ / /
| * | | am cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"Andreas Gampe2015-04-091-5/+2
| |\ \ \ | | |/ /
| | * | am f9ab2ad2: Merge "Installd: Fix Clang build"Andreas Gampe2015-04-091-5/+2
| | |\ \ | | | |/
| | | * Merge "Installd: Fix Clang build"Andreas Gampe2015-04-091-5/+2
| | | |\
| | | | * Installd: Fix Clang buildAndreas Gampe2015-04-091-5/+2
| | | |/
* | | | Merge "Pass through availability of audio mic for input devices."Tim Kilbourn2015-04-096-9/+43
|\ \ \ \
| * | | | Pass through availability of audio mic for input devices.Tim Kilbourn2015-04-096-9/+43
* | | | | am 65fe5dfd: am cbde9b92: am d107c305: Merge "Plumb through volume UUID when ...Jeff Sharkey2015-04-097-243/+132
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am cbde9b92: am d107c305: Merge "Plumb through volume UUID when building paths."Jeff Sharkey2015-04-097-243/+132
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am d107c305: Merge "Plumb through volume UUID when building paths."Jeff Sharkey2015-04-097-243/+132
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "Plumb through volume UUID when building paths."Jeff Sharkey2015-04-097-243/+132
| | | |\ \
| | | | * | Plumb through volume UUID when building paths.Jeff Sharkey2015-04-077-243/+132
* | | | | | am b8d1ee37: am 19db8c88: am ab91d03b: Merge "installd: Add support for SELF_...Richard Uhler2015-04-093-26/+40
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 19db8c88: am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEED...Richard Uhler2015-04-093-26/+40
| |\ \ \ \ | | |/ / /
| | * | | am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."Richard Uhler2015-04-093-26/+40
| | |\ \ \ | | | |/ /
| | | * | Merge "installd: Add support for SELF_PATCHOAT_NEEDED."Richard Uhler2015-04-093-26/+40
| | | |\ \
| | | | * | installd: Add support for SELF_PATCHOAT_NEEDED.Richard Uhler2015-04-073-26/+40
| | | | |/
* | | | | am d029e95a: am 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"Mark Salyzyn2015-04-081-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"Mark Salyzyn2015-04-081-3/+0
| |\ \ \ \ | | |/ / /
| | * | | am ad436ab5: Merge "dumpstate: scrub APANIC"Mark Salyzyn2015-04-081-3/+0
| | |\ \ \ | | | |/ /
| | | * | Merge "dumpstate: scrub APANIC"Mark Salyzyn2015-04-081-3/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * dumpstate: scrub APANICMark Salyzyn2015-04-081-3/+0
| | | |/
* | | | am 172ff24c: am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer thro...Dan Stoza2015-04-072-0/+18
|\ \ \ \ | |/ / /
| * | | am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerB...Dan Stoza2015-04-072-0/+18
| |\ \ \ | | |/ /
| | * | am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"Dan Stoza2015-04-072-0/+18
| | |\ \ | | | |/
| | | * Merge "libgui: Plumb detachBuffer through ConsumerBase"Dan Stoza2015-04-072-0/+18
| | | |\
| | | | * libgui: Plumb detachBuffer through ConsumerBaseDan Stoza2015-04-072-0/+18
| | | |/
* | | | am 6b4f28a7: am a53e955a: Merge "libgui: Plumb attach/detach through Surface"...Dan Stoza2015-04-070-0/+0
|\ \ \ \ | |/ / /
| * | | am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-a...Dan Stoza2015-04-072-1/+54
| |\ \ \ | | |/ /
| | * | Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-masterDan Stoza2015-04-072-1/+54
| | |\ \
| | | * | libgui: Plumb attach/detach through SurfaceDan Stoza2015-04-072-1/+54
* | | | | am 6d9e3dc5: am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-...Dan Stoza2015-04-070-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-masterDan Stoza2015-04-0715-346/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-masterDan Stoza2015-04-0715-346/+12
| | |\ \ \ | | | |/ /
| | | * | libgui: Remove IGBC::BufferItemDan Stoza2015-04-0715-346/+12
* | | | | am eb3704a5: am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C...Jeff Sharkey2015-04-076-41/+43
|\ \ \ \ \ | |/ / / /
| * | | | am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."Jeff Sharkey2015-04-076-41/+43
| |\ \ \ \ | | |/ / /
| | * | | am 1cd030be: Merge "Switch installd to compile as C++."Jeff Sharkey2015-04-076-41/+43
| | |\ \ \ | | | | |/ | | | |/|