summaryrefslogtreecommitdiffstats
path: root/drm/java
Commit message (Collapse)AuthorAgeFilesLines
* 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 2025-02-01 17:10:05 +0000