summaryrefslogtreecommitdiffstats
path: root/drm/java
Commit message (Collapse)AuthorAgeFilesLines
* Fix a few more stray libcore.io references.Elliott Hughes2014-04-281-1/+1
| | | | Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
* Move internal libcore.os users over to android.system.Elliott Hughes2014-04-281-3/+3
| | | | Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
* Update DrmOutputStream to use raw FileDescriptor.Jeff Sharkey2014-02-061-11/+22
| | | | | | | | | | | This allows DownloadManager to use FDs, paving the way for downloading directly to content:// Uris. Also return flag indicating if deleteOlderFiles() actually deleted anything. Update tests to verify. Bug: 5287571 Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
* am 38638b2f: am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge ↵Narayan Kamath2014-01-291-1/+1
|\ | | | | | | | | | | | | "AArch64: Use long for pointers in DRM classes" * commit '38638b2fcc4aba428889d521d83762d716e32332': AArch64: Use long for pointers in DRM classes
| * AArch64: Use long for pointers in DRM classesAshok Bhat2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in DRM classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I101b0ea19ed93651c6ad1a9fa55e14e8be117469 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | Remove unused imports from frameworks/base.John Spurlock2013-11-201-1/+0
| | | | | | | | Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
* | Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-031-27/+9
| | | | | | | | | | | | | | | | | | This reverts commit 6fd97b7d93c5eeaefb2695786b35d1672c88b0cf. Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video bug: 10542864 Change-Id: I85b84d6b602079571be1a7237c907716db9cdf54
* | Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-231-9/+27
|/ | | | | | | | | | | | | | | 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: I5f2bfb43b676863ef4d220fd4ef1e48777e92752 (cherry picked from commit 84a5b5cab40711e20ba70c5ed4dfeab6b558b53b)
* Move stream creation outside of DrmOutputStream.Jeff Sharkey2012-12-171-33/+34
| | | | | | | | More closely matches the object ownership pattern used by other stream APIs. Callers must now explicitly finish(). Also fixes write(int) bug by switching to Streams API. Change-Id: I64f9c5887ef02496b1ce4e97ce6af5dad93b4be2
* Move DRM to CloseGuard, add DrmOutputStream.Jeff Sharkey2012-12-132-9/+124
| | | | | | | | | Switch DrmManagerClient to using CloseGuard to better track leaked resources. Add DrmOutputStream which applies DRM transformation as data is written, similar to FilterOutputStream. Also writes DRM headers before closing. Change-Id: Ic106a3e6f6ff666e4dda484fbd234a0849eec8c0
* am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0714-0/+0
|\ | | | | | | | | * commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04': Correct executable bit for source files
| * Correct executable bit for source filesKenny Root2012-11-0714-0/+0
| | | | | | | | | | | | | | | | | | Many media files and source code files were marked as executable in Git. Remove those. Also a shell script and python script were not marked as executable. Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
* | Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-221-2/+26
|/ | | | | | | | | | At present, we did not actually pass the fd. This patch allows us to make the changes necessary in the future without worrying too much about broken build. related-to-bug: 6426185 Change-Id: I125decff9be621a72f2631fd439994a94a526606
* Fix an issue where the message queue fails to queue in the looper threads ↵James Dong2012-05-071-15/+17
| | | | | | | | because they are not created. o related-to-bug: 6293875 Change-Id: I03dbb2782bd90f88d1f8df086b8a529730afe5dc
* Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes"James Dong2012-03-023-47/+136
|\
| * Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classesJames Dong2012-03-013-47/+136
| | | | | | | | | | | | | | | | | | | | o added missing javadoc comment for some public fields o added checks for arguments o DrmSupportInfo should have not been exposed as public. A default package access modifier appears to be more proper but we may not be able to change the modifier. Change-Id: I5b284c17219c5121f241ee2934fb3e859ce7c827
* | am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug ↵Jean-Baptiste Queru2012-03-011-15/+63
|\ \ | |/ |/| | | | | | | | | fix: add an API to release resources" * commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7': DRM framwork bug fix: add an API to release resources
| * DRM framwork bug fix: add an API to release resourcesKei Takahashi2012-02-291-15/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When DrmManagerClient object is created and released many times, the process suddenly crashes. The case can happen when we make many thumbnails of DRM-encrypted contents. The problem is caused by shortage of file descriptors. DrmManagerClient releases references of file descriptors only when GC runs. So file descriptors are kept long time even after the reference of DrmManagerClient are released. By introducing DrmManagerClient#release() API, the problem is solved. An application call this API when we no longer need to use DrmManagerClient object. Changes are made by SEMC and Sony. Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
* | Merge "Fix API issues in DrmRights class."James Dong2012-02-281-33/+22
|\ \
| * | Fix API issues in DrmRights class.James Dong2012-02-271-33/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | o account id and subscription id are not mandatory, and thus can be anything such as null or an empty string. o removed unnecessary or thus inconsistent checks for account id and subscription id o updated the javadoc to specify that mimeType could not be null or an empty string. Change-Id: I704f1dd7fc5d33060da908aae0469d560c7db036
* | | Merge "Deprecate default constructor for classes that should have been meant ↵James Dong2012-02-281-0/+30
|\ \ \ | | | | | | | | | | | | to be interfaces"
| * | | Deprecate default constructor for classes that should have been meant to be ↵James Dong2012-02-271-0/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | interfaces o We should have not exposed these default constructors in the first place. Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad
* | | Merge "Added missing javadoc comment for public API in DrmUtils class"James Dong2012-02-281-5/+25
|\ \ \
| * | | Added missing javadoc comment for public API in DrmUtils classJames Dong2012-02-271-5/+25
| |/ / | | | | | | | | | | | | | | | o also fixed mis-spelled private method name (quiteDispose => quietlyDispose) Change-Id: I692cd7471eac547b849dd53853f60843b3915750
* | | Deprecated a mis-spelled method and replaced it with a new methodJames Dong2012-02-271-0/+11
|/ / | | | | | | Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
* | Merge "Improved comment about DrmStore.ConstraintsColumns"James Dong2012-02-242-6/+27
|\ \
| * | Improved comment about DrmStore.ConstraintsColumnsJames Dong2012-02-232-6/+27
| | | | | | | | | | | | Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
* | | Only allow valid types to be used in DrmErrorEvent and DrmInfoEventJames Dong2012-02-243-8/+66
|/ / | | | | | | | | | | | | | | | | o This patch will prevent applications from abusing the API by using arbitrary int value for DrmErrorEvent or DrmInfoEvent types. o We should have not defined some type constants in the super/base class, DrmEvent. Change-Id: Id0bb12caa8ce471cb6951cc2b5d37ea408f90063
* | Added checks for illegal argumentsJames Dong2012-02-154-4/+40
|/ | | | Change-Id: Ib386c33b7e2cab12cabbb9dc023d54df05472960
* Fix for bug 4371230.Gloria Wang2011-07-251-4/+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-221-21/+14
| | | | | | | - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle. Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
* -Fix some typoGloria Wang2011-06-152-14/+14
| | | | | | -Remove one unnecessary memory allocation Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
* am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change ↵Bill Gruber2011-03-2314-466/+589
|\ | | | | | | | | | | | | contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 * commit '640f63c2669fc9dc38b349066d4d28111655dc3f': DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
| * DRM API doc scrubBill Gruber2011-03-2314-466/+589
| | | | | | | | | | | | | | This change contains information contributed by Sony Corporation. Bug: 4119363 Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
* | am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one ↵Gloria Wang2011-03-174-9/+81
|\ \ | |/ | | | | | | | | | | more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 * commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707': Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
| * Fix for 4089881.Gloria Wang2011-03-164-9/+81
| | | | | | | | | | | | | | | | - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
* | Merge "Bug fixes of DRM framework."Gloria Wang2011-03-151-1/+1
|\ \ | |/ |/|
| * Bug fixes of DRM framework.Gloria Wang2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | For issue 4082089Gloria Wang2011-03-143-6/+18
|/ | | | | | Add more info and error events into the DRM framework Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
* To support uri started with http:// in some Java APIsGloria Wang2011-03-071-0/+5
| | | | | | Fix for bug 4016388. Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
* Do not call processDrmInfo if acquireDrmInfo returns nullGloria Wang2011-03-021-0/+3
| | | | Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673
* DRM Framework bug fixes.Takeshi Aimi2010-11-301-19/+27
| | | | | | | | | | - 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
* Update of DRM Framework.Takeshi Aimi2010-11-193-48/+60
| | | | | | | | | | | | | | | | | | | | | | -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
* Update of DRM frameworkTakeshi Aimi2010-11-025-182/+60
| | | | | | | | | | | | | | | | - 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
* Update of DRM framework.Takeshi Aimi2010-10-044-94/+590
| | | | | | | | | | | | | - 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
* There is no @note javadoc tag.Joe Onorato2010-09-161-5/+5
| | | | Change-Id: I4bb4e0be518b01f2a81d870ff4ec9da81555afbd
* Initial contribution from Sony Corporation.aimitakeshi2010-09-0112-0/+1844
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-19 12:49:47 +0000