summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
* am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-266-11/+3
|\
| * Remove superfluous OpenSSL include paths.Adam Langley2015-01-226-11/+3
* | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-3/+2
|\ \ | |/
| * Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-3/+2
* | am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-112-9/+0
|\ \ | |/
| * Move to libc++.Dan Albert2014-11-112-9/+0
| * am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
| |\
| * \ am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| |\ \
| * \ \ am 9707ffaf: am fd7e0440: Merge "Check for NULL before calling asBinder()."Dan Albert2014-09-221-1/+2
| |\ \ \
* | \ \ \ am 3b97d9d7: am d556fad7: Fix build, update mock drm pluginJeff Tinker2014-11-072-0/+27
|\ \ \ \ \
| * | | | | Fix build, update mock drm pluginJeff Tinker2014-11-062-0/+27
* | | | | | am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr...Jeff Tinker2014-11-061-0/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add missing secure stop methodsJeff Tinker2014-10-311-0/+10
* | | | | | am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove dead code.Chih-Hung Hsieh2014-10-071-8/+0
| | |_|_|/ | |/| | |
* | | | | am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix comparison of String8 to char* literalBernhard Rosenkraenzer2014-09-181-1/+1
* | | | | am 9707ffaf: am fd7e0440: Merge "Check for NULL before calling asBinder()."Dan Albert2014-09-221-1/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Check for NULL before calling asBinder().Dan Albert2014-09-161-1/+2
| |/ /
* | | am c2320223: Fix build break in mock drm plugin buildJeff Tinker2014-08-042-0/+8
|\ \ \ | | |/ | |/|
| * | Fix build break in mock drm plugin buildJeff Tinker2014-08-042-0/+8
* | | am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-devJeff Tinker2014-08-041-0/+4
|\ \ \ | |/ /
| * | Allow device to be unprovisionedJeff Tinker2014-08-011-0/+4
* | | am bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-253-13/+91
|\ \ \ | |/ / |/| / | |/
| * Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-253-13/+91
| * Fix Externally reported security issueJeff Tinker2014-07-111-1/+12
* | Create a single test binary.Edwin Wong2014-07-012-63/+29
* | Fix build target path.Edwin Wong2014-07-012-2/+3
* | Add Unit Tests for ClearKey PluginJohn "Juce" Bruce2014-06-305-2/+665
* | ClearKey Implementation of DRM Plugin APIsJohn "Juce" Bruce2014-07-0117-0/+1070
* | JsonWebKey support.Edwin Wong2014-07-015-0/+729
* | Implement ClearKey Init Data ParserJohn "Juce" Bruce2014-07-013-0/+195
* | Implement OpenSSL-Based DecryptorJohn "Juce" Bruce2014-07-014-1/+126
* | Add ClearKey UtilitiesJohn "Juce" Bruce2014-07-014-0/+138
* | Fix Externally reported security issueJeff Tinker2014-06-201-1/+12
* | am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when n...Adam Lesinski2014-06-106-38/+277
|\ \
| * \ am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service...Adam Lesinski2014-06-096-38/+277
| |\ \
| | * | Implement a NoOp DrmManagerClientImpl when no DRM service existsAdam Lesinski2014-06-066-38/+277
* | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-153-14/+14
|\ \ \ \ | |/ / /
| * | | am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-153-14/+14
| |\ \ \ | | | |/ | | |/|
| | * | media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-153-14/+14
* | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-7/+48
|\ \ \ \ | |/ / /
| * | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-7/+48
| |\ \ \ | | |/ / | |/| / | | |/
| | * Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-292-7/+48
* | | am 9a9481f8: am 0e7e5db7: Merge "More 32-bit only"Glenn Kasten2014-03-171-0/+2
|\ \ \ | |/ /
| * | More 32-bit onlyGlenn Kasten2014-03-141-0/+2
* | | am e0a76795: am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_...Ying Wang2014-02-261-1/+2
|\ \ \ | |/ /
| * | Use multilib-friendly LOCAL_MODULE_RELATIVE_PATHYing Wang2014-02-261-1/+2
* | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-1/+1
|\ \ \ | |/ /