summaryrefslogtreecommitdiffstats
path: root/drm/drmserver
Commit message (Collapse)AuthorAgeFilesLines
* Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-252-13/+72
| | | | | | | Add SELinux checks on all interfaces exposed by the DrmManagerService. Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
* Fix Externally reported security issueJeff Tinker2014-07-111-1/+12
| | | | | bug: 12724697 Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
* media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-151-10/+10
| | | | Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
* More 32-bit onlyGlenn Kasten2014-03-141-0/+2
| | | | Change-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36
* Remove obsolete drm manager codeJeff Tinker2013-07-232-20/+0
| | | | | bug: 9545965 Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
* Add liblogYing Wang2013-04-091-0/+1
| | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* Fix for not ending up in an eternal loop in DrmManager.Henrik B Andersson2013-01-241-33/+23
| | | | | | | | | | | In the original code a random number is used to get try to find an empty slot in the list of free DRM id's. When you reached the limit of 0xfff id's you ended up in an eternal loop causing ANRs. Updated by James Dong <jdong@google.com>. Change-Id: I70176cc3f770223c4a8060f9739fe2bc03a703d9
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-102-4/+4
| | | | | | | | | 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/+40
|/ | | | | | | | | | | | 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
* Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.Andreas Huber2012-04-171-15/+1
| | | | | | | Allow anyone to talk to drm services. Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392 related-to-bug: 6276111
* 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
* Added permission check for all sensitive drm API callsJames Dong2012-02-281-0/+21
| | | | | | o all drm calls using a DecryptHandle now check the permission before proceeding Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
* Remove unnecessary header file includes for drmserverJames Dong2012-02-271-5/+0
| | | | Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
* Separate sniffing from session initializationJames Dong2012-01-122-8/+11
| | | | | | | | | | | | 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
* am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ↵James Dong2011-12-141-3/+2
|\ | | | | | | | | | | | | to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. * commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * Revert the following patches because they may lead to power regression ↵James Dong2011-12-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
* | am f14dc291: Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
|\ \ | |/ | | | | | | * commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1': Fix drm enumeration order, resolves failure to play forward lock ringtones
| * Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker2011-12-091-2/+3
| | | | | | | | | | Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9 related-to-bug: 5735466
* | Fix log messageGlenn Kasten2011-11-101-1/+4
| | | | | | | | | | | | Log did not have a tag, and was wrong level Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-262-31/+31
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Modified loadPlugIns to load from /vendor and /system; skip libraries that ↵Edwin Wong2011-09-211-9/+15
| | | | | | | | are already loaded. BUG: 5284436 Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
* Fix for bug 4371230.Gloria Wang2011-07-252-24/+34
| | | | | | | | | - 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
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-7/+2
| | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* Fix memory leak from retrieval of getSupportedDrmInfo.James Dong2011-04-241-0/+2
| | | | Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
* Merge "Bug fixes of DRM framework."Gloria Wang2011-03-151-1/+0
|\
| * Bug fixes of DRM framework.Gloria Wang2011-03-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add death listener to clean-up drmserver appropriately when drmserver died. - Remove "static" declaration of mUniqueIdVector because it was not needed to be static variable. - Remove "class DrmContentIds;" because the class does not exist. - contentPath in saveRights() could be empty because it is not required by some DRM schemes. - Fix naming convention to use sXXX for static variables. - Fix typo Change-Id: I7d440488fc074c200f1009d1bafafeffebd690b2
* | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" ↵Glenn Kasten2011-03-152-68/+1
|\ \ | | | | | | | | | | | | | | | | | | into honeycomb-mr1 * commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d': Bug 4016329 do full string comparisons
| * | Bug 4016329 do full string comparisonsGlenn Kasten2011-03-142-68/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add memory leak tracking/debugging code to drm serverJames Dong2011-03-142-0/+30
|/ / | | | | | | | | | | bug - 4099038 Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
* | - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-111-2/+2
|/ | | | | | | | | | | In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock. Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
* - Change level of some LOGs from LOGE to LOGV because those logsGloria Wang2011-03-091-2/+29
| | | | | | | | 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/+4
| | | | Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
* Merge "Bug 3229711"Glenn Kasten2011-01-121-1/+1
|\
| * Bug 3229711Glenn Kasten2011-01-111-1/+1
| | | | | | | | Change-Id: I3a4d41597cb92a1526417a622390dbb93dc71e99
* | am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-111-1/+5
|\ \ | |/ |/| | | | | * commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d': DRM Framework bug fixes.
| * DRM Framework bug fixes.Takeshi Aimi2010-11-301-1/+5
| | | | | | | | | | | | | | | | | | | | - Make sure to clean-up obsolete listeners. - Close cursor after using it. - Add virtual destructor to the base class of OnInfoListener. Changes are made by SEMC and Sony. Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
* | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-222-2/+57
|\ \ | |/ | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * Update of DRM Framework.Takeshi Aimi2010-11-192-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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-192-6/+6
| | | | | | | | Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-032-61/+76
|\ \ | |/ | | | | Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
| * Update of DRM frameworkTakeshi Aimi2010-11-022-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-1/+0
| | | | | | | | Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
* | Do not create drm directory here. Fix for bug 3134576.Gloria Wang2010-10-261-16/+1
|/ | | | Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
* Update of DRM framework.Takeshi Aimi2010-10-043-72/+135
| | | | | | | | | | | | | - 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
* fix buildJean-Baptiste Queru2010-09-091-2/+7
| | | | Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
* Initial contribution from Sony Corporation.aimitakeshi2010-09-015-0/+838
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-08 18:10:17 +0000