summaryrefslogtreecommitdiffstats
path: root/drm/common
Commit message (Collapse)AuthorAgeFilesLines
* am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am ↵Jeff Tinker2015-09-211-6/+10
|\ | | | | | | | | | | | | 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev * commit '78f7932ddd8fed44a8fb421fcbf31f4ec1a82713': Fix heap data leak vulnerability
| * am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am ↵Jeff Tinker2015-09-211-6/+10
| |\ | | | | | | | | | | | | | | | | | | d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev * commit '7b642b085413ffd92caa07933b21bc00b55f9905': Fix heap data leak vulnerability
| | * am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-devJeff Tinker2015-09-161-6/+10
| | |\ | | | | | | | | | | | | | | | | * commit '38281f1cbcd4804095828f19b7954d5219560fcd': Fix heap data leak vulnerability
| | | * Fix heap data leak vulnerabilityJeff Tinker2015-09-141-6/+10
| | | | | | | | | | | | | | | | | | | | bug: 23600291 Change-Id: I7979e9e25ada01c13775be8580d433a8b4ce4ffe
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | | Harden drmserver process against fuzzing attacksJeff Tinker2015-04-291-10/+46
| | | | | | | | | | | | | | | | | | | | bug: 19572107 Change-Id: I5ba0a434b016e8dc376f7d0eef5cf76b99ab50fd
* | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-141-2/+1
|/ / / | | | | | | | | | | | | | | | to use the new static version. Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
* | | Check for NULL before calling asBinder().Dan Albert2014-09-161-1/+2
|/ / | | | | | | | | | | The old asBinder() checked if this == NULL, which is undefined behavior. Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
* | media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-151-2/+2
|/ | | | Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
* Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-032-122/+2
| | | | | | | | | This reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62. Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video bug: 10542864 Change-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca
* Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-232-2/+122
| | | | | | | | | | | | | | | In DRM framework, plugins can transmit DrmInfoEvent to Java layer. Although DrmInfoEvent has several entries, current implementation can only convey integer and String. This change enables plugins uto propagate a hashmap to Java layer. The hashmap can have one or more Strings and one byte array as value. Changes are made by Sony Corporation. bug: 10459159 Change-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7 (cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)
* Remove obsolete drm manager codeJeff Tinker2013-07-231-25/+0
| | | | | bug: 9545965 Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
* Fixed memory leakage in the DRM frameworkHung Nguyen2013-01-242-5/+9
| | | | Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
* Allow DRM client to pass the FD of an open file to the DRM server.Gene Morgan2012-09-201-4/+16
| | | | | | | | | | | | | Part of CL https://googleplex-android-review.googlesource.com/#/c/222797/ This modifies the marshall/unmarshall of IDrmManagerService:: acquireDrmInfo() to watch for DrmInfoRequest tag "FileDescriptorKey". If tag is present convert string to binary FD, then back to string after passage through the interface's Binder. Relevant bug reports: bug: 6426185 Change-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-102-4/+14
| | | | | | | | | This patch enables the drm framework to avoid opening files directly. As a result, the drm framework no longer needs the sdcard read permision. o related-to-bug: 6426185 Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ↵James Dong2012-06-132-0/+190
|\ | | | | | | | | | | | | /frameworks/av/" into jb-dev * commit 'e20435de10f63af812da9d4f801b61a8817733a0': Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
| | | | | | | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-232-0/+56
|/ | | | | | | | | | | | In case of DRM streaming, decrypt session can start just after receiving the header, and it doesn't need to wait for the entire content. However, current API of DRM framework only accepts file handle or URI. With this new API, DRM session can start without waiting for the entire content. Changes are made by SEMC and Sony. Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
* AV Android make files changesJames Dong2012-03-281-3/+3
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Separate sniffing from session initializationJames Dong2012-01-122-9/+34
| | | | | | | | | | | | This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened o The change is backward compatibile in that no update is required for existing drm plug-ins if they do not plan to provide separate sniffer/extractor related-to-bug: 5725548 Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-2/+2
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-262-68/+68
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Fix ordering assumption of argument evaluation.Gloria Wang2011-08-011-21/+45
| | | | | | | | | | No specific order is specified in the C++ standard, but the order of the calls to Parcel read commands matters. Move any calls with multiple reads to local variables. Fix for bug 5103507. Change-Id: Ic23ad50ec5f443146f00324b66d5e2bd5b9ffd0d
* Fix for bug 4371230.Gloria Wang2011-07-251-2/+2
| | | | | | | | | - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
* - Add two sanity checks.Gloria Wang2011-06-222-0/+5
| | | | | | | - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle. Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
* -Fix some typoGloria Wang2011-06-151-14/+14
| | | | | | -Remove one unnecessary memory allocation Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
* Merge "Include strings.h for the strcasecmp prototype."Carl Shapiro2011-03-221-1/+1
|\
| * Include strings.h for the strcasecmp prototype.Carl Shapiro2011-03-221-1/+1
| | | | | | | | Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
* | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in ↵Gloria Wang2011-03-221-2/+17
|\ \ | |/ |/| | | | | | | | | DecryptHandle to support bug 4126624" into honeycomb-mr1 * commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385': Add one more field in DecryptHandle to support bug 4126624
| * Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-211-2/+17
| | | | | | | | Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
| * do not merge: Cherry pick change I6529695c from master to partially fix bug ↵Gloria Wang2011-03-211-188/+88
| | | | | | | | | | | | 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
* | Fix for 4084554.Gloria Wang2011-03-211-188/+88
| | | | | | | | | | | | DRM framework support for enabling/disabling copy control settings from a DRM plugin Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
* | Fix for bug 4126103.Gloria Wang2011-03-171-2/+2
| | | | | | | | | | | | | | | | | | mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8& Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
* | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" ↵Glenn Kasten2011-03-151-2/+2
|\ \ | |/ | | | | | | | | | | into honeycomb-mr1 * commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d': Bug 4016329 do full string comparisons
| * Bug 4016329 do full string comparisonsGlenn Kasten2011-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | Use full string comparisons instead of partial for file extension and MIME type. Do case-insensitive comparison of MIME type and file extensions. Fix error in comment for String8::getPathExtension. Remove dead code -- StringTokenizer is unused. Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
* | Fix for bug 3477330Gloria Wang2011-03-101-5/+0
|/ | | | | | | This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
* - Change level of some LOGs from LOGE to LOGV because those logsGloria Wang2011-03-091-2/+2
| | | | | | | | are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039 Change-Id: I52fed22069f0cda6c4ac6a5363469168c797a33b
* To support DRM files without file extensionGloria Wang2011-03-021-1/+1
| | | | Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
* Bug 3361124 Remove drmioserver, continuedGlenn Kasten2011-01-212-75/+0
| | | | Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
* More fix for 64 bit offset.Gloria Wang2011-01-191-2/+2
| | | | Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
* am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-224-0/+184
|\ | | | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * Update of DRM Framework.Takeshi Aimi2010-11-194-0/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Access permission handling Introduce an internal function which allows the desired process to access decryption flow. This new function is just for reference and each OEM manufacturer should implement/replace with their solutions. -New API, getMetadata() This API is for retrieving media metadata from container-based DRM, such as OMA forward-lock content. This API asks DRM agent to retrieve media metadata hiddein inside of DRM special container. -New API, acquireRights() This API wraps acquireDrmInfo() and processDrmInfo(). If DRM agent has valid implementation of both APIs, Application can acquire DrmRights only by calling this API. -Bug fix in event loop of OnInfoListener. Separate OnInfo event loop from mail thread loop so as to avoid the issue that message is not dispatched when mail thread is busy. Changes are made by SEMC and Sony. Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
* | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-193-17/+17
| | | | | | | | Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-033-52/+75
|\ \ | |/ | | | | Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
| * Update of DRM frameworkTakeshi Aimi2010-11-023-52/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Overload openDecryptSession() with uri parameter in order to accept URI of DRM content, Following API is added, DecryptHandle*openDecryptSession(const char* uri);. - Unify texisting three event types of processDrmInfo() so that caller of DRM framework does not have to handle many event types. - Let DrmManagerService call load/unload plugins API so that client of DRM framework does not have to manage plug-in load/unload. - Trivial fix in DrmManagerClient.java is also incorporated. Changes are made by Sony Corporation. Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
* | Disable some logsGloria Wang2010-11-021-4/+0
|/ | | | Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
* Update of DRM framework.Takeshi Aimi2010-10-049-93/+162
| | | | | | | | | | | | | - Change "void" type of return value to "int" for returning status. - Add some of overloaded Java APIs which accept database Uri as input. - Add asynchronous APIs - Add OnEventListener and OnErrorListener for asynchronous APIs - Disable debug log - Change decrypt() API to accept an optional buffer needed by some of DRM schemes Changes are incorporated by Sony Corporation. Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c
* Make DRM libraries optionalJean-Baptiste Queru2010-09-101-0/+2
| | | | Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
* Initial contribution from Sony Corporation.aimitakeshi2010-09-0114-0/+2429
Add DRM Framework to support DRM content playback together with StageFright. - DRM Framework code is added - include/drm - drm - api/current.xml is updated to include DRM Framework Java APIs - cmds/servicemanager/service_manager.c is modified to add drmManager and drmIOService. Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb
generated by cgit v1.1 at 2024-05-09 07:50:06 +0000