554 Commits (7132f8552ab68a71c16e729808f9e5f73dd66fe1)

Author SHA1 Message Date
Chih-hung Hsieh d9c907b8fd Merge "Use -Werror in frameworks/av"
7 years ago
Chih-hung Hsieh cf8437acd9 Merge "Use -Werror in frameworks/av"
7 years ago
Chih-Hung Hsieh 5cf0751390 Use -Werror in frameworks/av
7 years ago
Steven Moreland 56a687d9d2 Merge "Use libhidl function to convert to hidl IMemory." am: b63a28ffb1 am: 86d60a6bf6 am: d818b6f9a3
7 years ago
Steven Moreland a3ad5bda66 Merge "Use libhidl function to convert to hidl IMemory." am: b63a28ffb1 am: 86d60a6bf6
7 years ago
Steven Moreland d818b6f9a3 Merge "Use libhidl function to convert to hidl IMemory." am: b63a28ffb1
7 years ago
Steven Moreland 86d60a6bf6 Merge "Use libhidl function to convert to hidl IMemory."
7 years ago
Jeff Tinker b4ce81d08d Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758 am: 650e3e6325 am: 2921de78e6
7 years ago
Jeff Tinker 6e18d372ac Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758 am: 650e3e6325
7 years ago
Jeff Tinker 8db99a18d8 Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758
7 years ago
Jeff Tinker 2921de78e6 Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758
7 years ago
Jeff Tinker 650e3e6325 Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b
7 years ago
Jeff Tinker 3cf728e758 Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39
7 years ago
Steven Moreland 6536606cfe Use libhidl function to convert to hidl IMemory.
7 years ago
Adam Stone 72b054de2c Merge "Fix package name reporting in MediaDrm metrics." into oc-mr1-dev am: 7dca8d7587
7 years ago
Adam Stone ed82e9adc8 Merge "Fix package name reporting in MediaDrm metrics." into oc-mr1-dev
7 years ago
TreeHugger Robot 7dca8d7587 Merge "Fix package name reporting in MediaDrm metrics." into oc-mr1-dev
7 years ago
Edwin Wong fe3c170a34 Merge "Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair." into oc-mr1-dev am: 872011203e
7 years ago
Edwin Wong cf43836c9a Merge "Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair." into oc-mr1-dev
7 years ago
TreeHugger Robot 872011203e Merge "Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair." into oc-mr1-dev
7 years ago
Adam Stone 21c721250c Fix package name reporting in MediaDrm metrics.
7 years ago
Edwin Wong 815c9259d8 Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair.
7 years ago
Steven Moreland 144865c5dd Use vendor variant of libstagefright_foundation.
7 years ago
Edwin Wong 7b40873793 Merge "Fix ClearKey Drm base64 en/decoding to use base64url." into oc-mr1-dev am: 3b224af571
7 years ago
Edwin Wong eb68f29347 Merge "Fix ClearKey Drm base64 en/decoding to use base64url." into oc-mr1-dev
7 years ago
Edwin Wong 999782fa3f Fix ClearKey Drm base64 en/decoding to use base64url.
7 years ago
TreeHugger Robot 52f34c8988 Merge "Fix format string warnings"
7 years ago
George Burgess IV 843328ff13 Fix format string warnings
7 years ago
Zhizhou Yang 991f53aa6d Merge "Fix memory leak warning in FwdLockEngine.cpp" am: 809ea9d9cc am: b5c1bcb963 am: d10d7e154c
7 years ago
Zhizhou Yang 1fb7851c8c Merge "Fix memory leak warning in FwdLockEngine.cpp" am: 809ea9d9cc am: b5c1bcb963
7 years ago
Zhizhou Yang b5c1bcb963 Merge "Fix memory leak warning in FwdLockEngine.cpp"
7 years ago
Edwin Wong 420b2094a3 Merge "Support both Clear key plugin UUIDs." into oc-mr1-dev
7 years ago
Zhizhou Yang 67810646ca Fix memory leak warning in FwdLockEngine.cpp
7 years ago
Jeff Tinker eae126d32a Merge "Fix failure to check HIDL return status" into oc-dr1-dev
7 years ago
Jeff Tinker 76abba2b61 Merge "Fix failure to check HIDL return status" into oc-dr1-dev
7 years ago
Edwin Wong d8d7bf6128 Support both Clear key plugin UUIDs.
7 years ago
Jeff Tinker f0e89b0b24 Fix failure to check HIDL return status
7 years ago
Jeff Tinker ab594a7143 Merge "Fix failure to check HIDL return status" into oc-dr1-dev
7 years ago
Jeff Tinker 81b06822a7 Fix failure to check HIDL return status
7 years ago
Jeff Tinker 319d5f43d1 Fix failure to check HIDL return status
7 years ago
John W. Bruce 33ecc4f6b0 Marshal Metrics
7 years ago
Jeff Tinker 6133281c9b Close all open drm sessions before destroying a plugin.
7 years ago
Steven Moreland 8cc8de2962 Make ClearKeyDrmUnitTest build with the VNDK.
7 years ago
TreeHugger Robot bcbda5c525 Merge "Make ClearKeyFetcherTest build with the VNDK."
7 years ago
TreeHugger Robot 8280e41566 Merge "Build libmockdrmcryptoplugin with VNDK."
7 years ago
Steven Moreland ee3491c350 Make ClearKeyFetcherTest build with the VNDK.
7 years ago
Tri Vo f0ee3c62f4 Build libmockdrmcryptoplugin with VNDK.
7 years ago
Jayant Chowdhary c19c2a5b31 Build libmockcasplugin with the VNDK.
7 years ago
Jiyong Park 04f7a67df1 Build libclearkeycasplugin with BOARD_VNDK_VERSION
7 years ago
TreeHugger Robot 8538e15909 Merge "cas: convert MediaCas to HIDL"
7 years ago
Steven Moreland d29a82f816 Use vendor variant of libstagefright_foundation.
7 years ago
Chong Zhang d5a416a49d cas: convert MediaCas to HIDL
7 years ago
Steven Moreland cb316c7ecc Use vendor variant of libstagefright_foundation.
7 years ago
Jiyong Park bd5609f0a3 DO NOT MERGE: Merge commit '89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64
7 years ago
Jeff Tinker 67c3e635b9 Merge "Check for drmhal plugin null pointer deref" into oc-dev am: a5f3e42433
7 years ago
Jeff Tinker 5d057106af Merge "Check for drmhal plugin null pointer deref" into oc-dev
7 years ago
Jeff Tinker 8cccead54b Merge "Check for drmhal plugin null pointer deref" into oc-dev
7 years ago
Jeff Tinker 70367f525a Check for drmhal plugin null pointer deref
7 years ago
Jiyong Park 0c679bd4bd Merge "libdrmclearkeyplugin is linked against libstagefright_foundation_vendor" into oc-dr1-dev
7 years ago
Jiyong Park b719ae6523 libdrmclearkeyplugin is linked against libstagefright_foundation_vendor
7 years ago
Jiyong Park 54fabe00cd libdrmclearkeyplugin is linked against libstagefright_foundation_vendor
7 years ago
Chih-hung Hsieh eb96cfcbce Merge "Add OWNERS in frameworks/av" am: 7b2b2a497c
7 years ago
Chih-Hung Hsieh b1e2a23822 Add OWNERS in frameworks/av
7 years ago
Jeff Tinker c860da3ee1 Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0 am: 1ce2364aa0 am: 83cf30ec83
7 years ago
Jeff Tinker 414ff6e202 Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0 am: 1ce2364aa0
7 years ago
Jeff Tinker d499a9c6d1 Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0 am: 1ce2364aa0
7 years ago
Jeff Tinker 83cf30ec83 Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0
7 years ago
Jeff Tinker 8d214cd0b0 Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551
7 years ago
Jeff Tinker a64aff4551 Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082
7 years ago
Jeff Tinker 7a22df06c3 Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec
7 years ago
Jeff Tinker 5250bc1bec Fix integer overflow in mediadrmserver
7 years ago
Jeff Tinker eb21712f81 Fix integer overflow in mediadrmserver
7 years ago
Jeff Tinker eff89fb1b5 Merge "Allow drm plugin to be released when binder dies" into oc-dev
7 years ago
TreeHugger Robot ea21ebc8b5 Merge "Allow drm plugin to be released when binder dies" into oc-dev
7 years ago
Jeff Tinker 3e2891674e Allow drm plugin to be released when binder dies
7 years ago
Jeff Tinker d2b26cd85d Merge "Don't leak hwservicemanager binders" into oc-dev
7 years ago
TreeHugger Robot ac1b860260 Merge "Don't leak hwservicemanager binders" into oc-dev
7 years ago
Jeff Tinker 593111f446 Don't leak hwservicemanager binders
7 years ago
Jeff Tinker 4e8d00762c Merge "Don't load legacy plugins from /vendor/lib/drm" into oc-dev
7 years ago
TreeHugger Robot 1de69ea178 Merge "Don't load legacy plugins from /vendor/lib/drm" into oc-dev
7 years ago
Jeff Tinker 86a0b96ddc Merge "Fix resource leaks in drm hal" into oc-dev
7 years ago
Jeff Tinker be4401f6c4 Don't load legacy plugins from /vendor/lib/drm
7 years ago
Jeff Tinker f53d96676d Fix resource leaks in drm hal
7 years ago
Colin Cross cbe95e7697 Use %zu to print size_t
7 years ago
Colin Cross cd3b59c8ba Merge "Convert libdrmframework and drmserver to Android.bp" am: a33999bab9 am: 5eb26eebfb
7 years ago
Colin Cross 61d1c58c90 Convert libdrmframework and drmserver to Android.bp
7 years ago
TreeHugger Robot f23d7b5941 Merge "Remove redundant dependencies" into oc-dev-plus-aosp
7 years ago
Steven Moreland 8ea3bc44ea Remove redundant dependencies
7 years ago
Colin Cross 4f79e5a8d8 Use %zu to print size_t
7 years ago
Colin Cross 47552dd929 Convert libmediadrm to Android.bp
7 years ago
Colin Cross 94b8c5dfd7 Convert libmediadrm to Android.bp
7 years ago
Jeff Tinker a07af8aea7 Remove DISABLE_TREBLE_DRM
7 years ago
Treehugger Robot 6902463aa9 Merge changes Ib249b276,Ica1d0286,If4914340
7 years ago
Greg Kaiser 1c2c96a5c2 Merge "MockDrmCryptoPlugin: Don't truncate log output" am: 0e0e0819bd am: 3d065314ad
7 years ago
Colin Cross 8dbc120544 LOCAL_CLANG := true is now the default
7 years ago
Greg Kaiser 0fe7807867 MockDrmCryptoPlugin: Don't truncate log output
7 years ago
Marco Nelissen bd20f6bcd7 Clean up mediadrm dependencies
7 years ago
Chong Zhang 3b1d140980 MediaCas: move clear key plugin to /system/lib
7 years ago
TreeHugger Robot 9e7dd63dff Merge changes from topic 'api-review' into oc-dev
7 years ago
Jeff Tinker e309b22bff Change drm/crypto service names to "default"
7 years ago
Chong Zhang a78c1cc977 MediaCas: combine openSession methods
7 years ago
TreeHugger Robot ef0b6b6414 Merge "MediaCas: fixes for playback tests" into oc-dev
7 years ago
Chong Zhang b01fb48fcc MediaCas: fixes for playback tests
7 years ago
TreeHugger Robot 46da191f22 Merge "Add additional checks for invalid parameters" into oc-dev
7 years ago
Jeff Tinker 7268713681 Add additional checks for invalid parameters
7 years ago
TreeHugger Robot 2fdf283c82 Merge "Add Flag for Enabling 64-bit Media DRM Server" into oc-dev
7 years ago
Jeff Tinker ffbe644a25 Clearkey plugin didn't handle negative test cases
7 years ago
Rahul Frias b86f4b3ce0 Fix reclaim sessions (DO NOT MERGE)
7 years ago
John W. Bruce e9fec54517 Add Flag for Enabling 64-bit Media DRM Server
7 years ago
Chong Zhang 6dcab2bafd DRM: more fixes for heap base mapping -- DO NOT MERGE
7 years ago
Chong Zhang d07c92742f Revert "Revert "Fix decoder instantiation during playback"" -- DO NOT MERGE
7 years ago
Jeff Tinker 93e29c0846 Merge "Revert "Fix decoder instantiation during playback""
7 years ago
Jeff Tinker de7268d8e2 Revert "Fix decoder instantiation during playback"
7 years ago
Jeff Tinker 7ec2a45e48 Merge "Fix decoder instantiation during playback"
7 years ago
Jeff Tinker 33327c7f0f Fix decoder instantiation during playback
7 years ago
TreeHugger Robot 52d0204d8f Merge "MediaCas: add two sets of test plugins"
7 years ago
Chong Zhang 791a1a206b MediaCas: add two sets of test plugins
7 years ago
Jeff Tinker efb7b9b26b Merge "Fix CTS post submit failures"
7 years ago
Jeff Tinker d0cb831e7f Fix CTS post submit failures
7 years ago
Jeff Tinker 899f772101 Merge "Prevent findSession from creating new sessions"
7 years ago
Jeff Tinker e424bc24ea Merge "Fix mediaserver crash due to NULL errorDetailMessage"
7 years ago
Edwin Wong 9247e10531 Check opaque size in CREATE_PLUGIN.
7 years ago
Jeff Tinker 0be134af06 Fix mediaserver crash due to NULL errorDetailMessage
7 years ago
Jeff Tinker 6a4921ae04 Fix mediadrmserver not finding IServiceManager instance
7 years ago
Jeff Tinker d76b8b5877 Prevent findSession from creating new sessions
7 years ago
Jeff Tinker de2c37e75c Merge "Load vendor-provided drm hidl hal modules"
7 years ago
Jeff Tinker abeb36a8c2 Load vendor-provided drm hidl hal modules
7 years ago
Chong Zhang 886aca07d2 MediaCas: move *.aidl files from frameworks/base to frameworks/av
7 years ago
Chong Zhang 9dbe9a57bf MediaCas: add MediaCasService
7 years ago
Jeff Tinker 3cb5316c44 Support multiple codecs per crypto instance
7 years ago
Edwin Wong 38875a41d6 Fix isCryptoSchemeSupported's return value.
7 years ago
Jeff Tinker c82b9c335e Don't segfault on fail to create drm factory
8 years ago
Jeff Tinker f3a591cc9d Enable DRM HIDL HAL by default
8 years ago
Edwin Wong 68b3d9f49e Pass application packagename to drm plugin.
8 years ago
Jeff Tinker a53d6553fc Implement client code to use Drm and Crypto HALs
8 years ago
Edwin Wong ce756ce2ce provideKeyResponse to send an event to test AMediaDrm_setOnEventListener. am: 58a795ba81
8 years ago
Edwin Wong 8a0470a127 provideKeyResponse to send an event to test AMediaDrm_setOnEventListener.
8 years ago
Edwin Wong 58a795ba81 provideKeyResponse to send an event to test AMediaDrm_setOnEventListener.
8 years ago
Marco Nelissen 75571e4bc7 Clean up mediadrm dependencies
8 years ago
Marco Nelissen 4f197ec220 Merge "Remove unneeded links with dynamic libraries"
8 years ago
Marco Nelissen 263506542f Remove unneeded links with dynamic libraries
8 years ago
Marco Nelissen c661ae6165 Remove unneeded links with dynamic libraries
8 years ago
Jeff Tinker 9e27bc6c9c Fix memory leak in DRM framework
8 years ago
Glenn Kasten e755733692 Remove executable bit from ordinary files
8 years ago
Glenn Kasten 5f5ee1110d LOCAL_CLANG := true is now the default
8 years ago
Elliott Hughes b58c4e1bbd Merge "Stop including libcore/include/ in frameworks/av." am: adc9ba6520 am: c75164b942
8 years ago
Elliott Hughes fb78341ae3 Stop including libcore/include/ in frameworks/av.
8 years ago
Edwin Wong 95ec4e0742 Fix AMediaDrm_getKeyRequest which fails clearkey InitDataParser::parse test. am: 01a977aa75
8 years ago
Edwin Wong 01a977aa75 Fix AMediaDrm_getKeyRequest which fails clearkey InitDataParser::parse test.
8 years ago
Chih-Hung Hsieh aee0669a7b Merge "Fix clang-tidy warnings in drm."
8 years ago
Chih-Hung Hsieh 8c0164ca98 Fix clang-tidy warnings in drm.
8 years ago
Andy Hung 5cb96b83e6 Merge "Add memory heap checks for mediaserver and audioserver" into nyc-dev
8 years ago
Andy Hung 07b745e166 Add memory heap checks for mediaserver and audioserver
8 years ago
Chih-hung Hsieh f64686f3b8 Merge "Fix misc-macro-parentheses warnings." am: 64d4f64af0
8 years ago
Chih-Hung Hsieh 92c6b825ad Fix misc-macro-parentheses warnings.
8 years ago
Martijn Coenen 4c0d6da007 Merge "Move system services into correct cpusets." into nyc-dev
8 years ago
Martijn Coenen ecd0a41d9a Merge "Move system services into correct cpusets." into nyc-dev
8 years ago
Jeff Tinker 51ab9527d7 Merge "Remove MediaDrm stack from mediaserver" into nyc-dev
8 years ago
Jeff Tinker 3003807fcf Remove MediaDrm stack from mediaserver
8 years ago
Martijn Coenen 58f3e55413 Move system services into correct cpusets.
8 years ago
Treehugger Robot 29906b2401 Merge "libdrmframeworkcommon: Explicitly reference libbinder headers" am: 3911d5d
8 years ago
Christopher Wiley 0572c6e618 libdrmframeworkcommon: Explicitly reference libbinder headers
8 years ago
Jeff Tinker a1176a1ea1 Merge "Fix SIGPIPE errors from drmserver" into nyc-dev
8 years ago
Jeff Tinker 5a7ddf48cc Fix SIGPIPE errors from drmserver
8 years ago
Jeff Tinker 5f9a7eb465 Merge "Update how drm file descriptors are passed through framework" into nyc-dev
8 years ago
Jeff Tinker 2b7561f802 Update how drm file descriptors are passed through framework
8 years ago
Mark Salyzyn b11a8649de resolve merge conflicts of b5ab355 to nyc-dev-plus-aosp
8 years ago
Mark Salyzyn 5a8dbe7ad3 drm: unused argument warning messages
8 years ago
Aurimas Liutikas c903684e9a Fix the last warnings in frameworks/av/ drm code.
9 years ago
Aurimas Liutikas b2231171d8 Fix more unused parameter warnings in frameworks/av/drm.
9 years ago
Aurimas Liutikas c52ca47938 Suppress unused parameter warnings in libdrmframework.
9 years ago
Jeff Tinker 18cb1eca50 Support AES-CBC sample encryption in MediaDrm
9 years ago
Jeff Tinker 6ca0256a1d Remove unused MediaDrm.unprovisionDevice
9 years ago
Nick Kralevich 6ad1bce333 drmserver: add readproc group
9 years ago
Jeff Tinker 36af36b45d am 9a302c61: am 963522f9: am 2151d8f9: am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
9 years ago
Jeff Tinker 2151d8f9ae am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
9 years ago
Jeff Tinker 78f7932ddd am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
9 years ago
Jeff Tinker 0af5008096 am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
9 years ago
Jeff Tinker d61dbb36a6 am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
9 years ago
Jeff Tinker 38281f1cbc am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
9 years ago
Jeff Tinker 09ed70fab1 Fix heap data leak vulnerability
9 years ago
Tom Cherry dc6d89a528 am 9abb6302: am f7ddd009: Merge "bundle init.rc contents with its service"
9 years ago
Tom Cherry c6dd768006 bundle init.rc contents with its service
9 years ago
Jeff Tinker 9472e5f3ab Implement MediaCrypto.setMediaDrmSession in clearkey plugin
9 years ago
Adam Langley 7cf1fe5df8 FwdLockConv.c: include what you use.
9 years ago
Adam Langley 2544611b6f FwdLockConv.c: include what you use.
9 years ago
Jeff Tinker b408fa26c7 Harden drmserver process against fuzzing attacks
9 years ago
Jeff Tinker 2fb25c873e Add expiration update and keys change events
9 years ago
Jeff Tinker d072c909d8 Report key request message type for unprefixed EME
9 years ago
Kenny Root b7909adcef am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."
10 years ago
Adam Langley 683202e1d4 Remove superfluous OpenSSL include paths.
10 years ago
Marco Nelissen 77e79a509d resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp
10 years ago
Marco Nelissen f888020c6e Update calls to IInterface::asBinder()
10 years ago
Dan Albert 9226e7c5eb am 2f702c9b: am 43e10bb7: Merge "Move to libc++."
10 years ago
Dan Albert effaa7832a Move to libc++.
10 years ago
Jeff Tinker b7ea09ab66 am 3b97d9d7: am d556fad7: Fix build, update mock drm plugin
10 years ago
Jeff Tinker d556fad747 Fix build, update mock drm plugin
10 years ago
Jeff Tinker a4dd2e19f9 am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr1-dev
10 years ago
Jeff Tinker 3c1285e8f8 Add missing secure stop methods
10 years ago
Chih-Hung Hsieh 4fe73b54b4 am ac4d8b31: am 6ade0417: Merge "Remove dead code."
10 years ago
Chih-Hung Hsieh 375c025bc6 am ac4d8b31: am 6ade0417: Merge "Remove dead code."
10 years ago
Chih-Hung Hsieh f4a4c1da7e Remove dead code.
10 years ago
Glenn Kasten d061bcd3f4 am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"
10 years ago
Glenn Kasten d0eda851b7 am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"
10 years ago
Glenn Kasten fc36efee6f Merge "Fix comparison of String8 to char* literal"
10 years ago
Dan Albert 6221547f1c am 9707ffaf: am fd7e0440: Merge "Check for NULL before calling asBinder()."
10 years ago
Dan Albert 19ae665ba4 am 9707ffaf: am fd7e0440: Merge "Check for NULL before calling asBinder()."
10 years ago
Bernhard Rosenkraenzer f129e84add Fix comparison of String8 to char* literal
10 years ago
Dan Albert 1260451932 Check for NULL before calling asBinder().
10 years ago
Jeff Tinker 58a0788486 am c2320223: Fix build break in mock drm plugin build
10 years ago
Jeff Tinker c232022322 Fix build break in mock drm plugin build
10 years ago
Jeff Tinker e2209ffea3 am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-dev
10 years ago
Jeff Tinker 68b15554f6 Allow device to be unprovisioned
10 years ago
Nick Kralevich 7045f37119 am bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService."
10 years ago
Riley Spahn f785f49756 Add SELinux MAC to DrmManagerService.
10 years ago
Jeff Tinker 6868e98604 Fix Externally reported security issue
10 years ago
Edwin Wong 4ebf92c041 Create a single test binary.
10 years ago
Edwin Wong 2421a4ba30 Fix build target path.
10 years ago
John "Juce" Bruce 8d0bc4a8ea Add Unit Tests for ClearKey Plugin
10 years ago
John "Juce" Bruce 1fe11a5d1b ClearKey Implementation of DRM Plugin APIs
10 years ago
Edwin Wong 7bdf28d2b8 JsonWebKey support.
10 years ago
John "Juce" Bruce 6b3c147319 Implement ClearKey Init Data Parser
10 years ago
John "Juce" Bruce 16dfdcff6e Implement OpenSSL-Based Decryptor
10 years ago
John "Juce" Bruce 47a86fb328 Add ClearKey Utilities
10 years ago
Jeff Tinker b710094cc9 Fix Externally reported security issue
10 years ago
Adam Lesinski 31dcd338b3 am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
10 years ago
Adam Lesinski 4299a7c2b0 am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
10 years ago
Adam Lesinski 927634a981 Implement a NoOp DrmManagerClientImpl when no DRM service exists
10 years ago
Mark Salyzyn 1b24cf32e0 am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d
10 years ago
Mark Salyzyn e80631aa19 am 839d11d1: Merge changes I0a744dc7,Id993a70d
10 years ago
Mark Salyzyn 3ab368e081 media: use size_t for integer iterator to Vector::size()
10 years ago
Jeff Tinker 99021c47f4 am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm
10 years ago
Jeff Tinker f356a123bf am 68d9d71a: Support CAST V2 Authentication in MediaDrm
10 years ago
Jeff Tinker 68d9d71a79 Support CAST V2 Authentication in MediaDrm
10 years ago
Glenn Kasten 37e05edf1c am 9a9481f8: am 0e7e5db7: Merge "More 32-bit only"
10 years ago
Glenn Kasten 0e56849007 More 32-bit only
10 years ago
Ying Wang 9d79834400 am e0a76795: am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
11 years ago
Ying Wang f2d170f679 Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
11 years ago
Narayan Kamath 1d6fa7af12 resolved conflicts for merge of 566be7c3 to master
11 years ago
Kévin PETIT 377b2ec9a2 Make frameworks/av 64-bit compatible
11 years ago
Colin Cross 9be49c9158 am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
11 years ago
Colin Cross 7d6fc5ebc8 frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
11 years ago
Robert Shih 817d4aa19e Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.
11 years ago
Jeff Tinker 34486800a0 Fix MediaDrm cts tests
11 years ago
Jeff Tinker 4585e8f0ff Revert "Enhancement for OnInfo callback on DRM Framework"
11 years ago
Jeff Tinker ee7e77d55d fix MediaDrm.isCryptoSchemeSupported(uuid)
11 years ago
Takeshi Aimi 5ff7836da0 Enhancement for OnInfo callback on DRM Framework
11 years ago
Jeff Tinker 9cf69e0fc1 Add ability to test supported content types to MediaDrm
11 years ago
Jeff Tinker f355f18aa2 Remove obsolete drm manager code
11 years ago
Jeff Tinker 423e33ce65 Added CTS test for secure stop APIs
11 years ago