88 Commits

Author SHA1 Message Date
Gloria Wang
2ef2d49aa3 - Change level of some LOGs from LOGE to LOGV because those logs
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
2011-03-09 15:51:46 -08:00
Gloria Wang
b8b6a9a8d4 To support uri started with http:// in some Java APIs
Fix for bug 4016388.

Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
2011-03-07 10:41:41 -08:00
Gloria Wang
6c1bebe33e Merge "Do not call processDrmInfo if acquireDrmInfo returns null" 2011-03-02 19:50:41 -08:00
Gloria Wang
4ef690a38b Do not call processDrmInfo if acquireDrmInfo returns null
Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673
2011-03-02 17:06:16 -08:00
Gloria Wang
289401b756 To support DRM files without file extension
Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
2011-03-02 12:33:00 -08:00
Gloria Wang
e8c89a3199 Move all Widevine code which have dependency on vendor modules to vendor/widevine
Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
2011-02-18 22:42:26 -08:00
Gloria Wang
6681984cf6 - Update from Widevine
- Bug fixes

Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
2011-02-18 16:10:53 -08:00
Glenn Kasten
33fdd1c1d5 Bug 3361124 Remove drmioserver, continued
Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
2011-01-21 09:06:19 -08:00
Glenn Kasten
e9b467d7dd Bug 3361124 Remove drmioserver
Change-Id: I64cba4be8a38b60bf3873836b4cd0d1039e19706
2011-01-20 07:50:59 -08:00
Gloria Wang
3bf37ac4a0 am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
  More fix for 64 bit offset.
2011-01-19 16:01:34 -08:00
Gloria Wang
113529f062 am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
  More fix for 64 bit offset.
2011-01-19 15:59:13 -08:00
Gloria Wang
d0423d2b12 More fix for 64 bit offset.
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
2011-01-19 15:38:16 -08:00
Gloria Wang
7a5321d4d8 rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
2011-01-18 15:23:51 -08:00
Gloria Wang
c89d319321 am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit 'c35b3268919e6201f269eb9011ae184c5f613bc3':
  Initial OMA DRM forward lock contribution
2011-01-13 12:40:44 -08:00
Gloria Wang
c35b326891 am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
  Initial OMA DRM forward lock contribution
2011-01-13 12:38:29 -08:00
Gloria Wang
a220a29799 Merge "Initial OMA DRM forward lock contribution" 2011-01-13 10:51:13 -08:00
Glenn Kasten
70e8d9cb55 Merge "Bug 3229711" 2011-01-12 09:31:46 -08:00
Glenn Kasten
cbba720a46 Bug 3229711
Change-Id: I3a4d41597cb92a1526417a622390dbb93dc71e99
2011-01-11 17:15:49 -08:00
Gloria Wang
3b7983cfea am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."
* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
  DRM Framework bug fixes.
2011-01-11 14:55:56 -08:00
Pravat Dalbehera
a3e96bfa89 Initial OMA DRM forward lock contribution
OMA DRM forward lock agent is plugged into the
Open DRM framework. Forward lock agent implementation contains:
- Forward lock engine to communicate with framework
- Converter to encrypt the original file into a special format
- Decoder to feed the decrypted data for rendering
- Lightweight unique key-encryption mechanism
- Documentation

Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
2011-01-05 09:02:51 +01:00
Takeshi Aimi
f05913aaa0 DRM Framework bug fixes.
- 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
2010-11-30 16:27:42 +09:00
Gloria Wang
c584428795 Remove empty Widevine make files
Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
2010-11-24 15:39:20 -08:00
Gloria Wang
35f2d3997e am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
  Update of DRM Framework.
2010-11-22 21:29:08 -08:00
Gloria Wang
5fc3edb13e 64-bit file size/offset support for DRM framework
Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
2010-11-19 15:52:32 -08:00
Takeshi Aimi
dc91865622 Update of DRM Framework.
-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
2010-11-19 22:02:51 +09:00
Gloria Wang
e3afc288dd resolved conflicts for merge of a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
2010-11-03 11:39:04 -07:00
Gloria Wang
1b42e92dec Disable some logs
Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
2010-11-02 15:09:43 -07:00
Takeshi Aimi
c7b3ccc564 Update of DRM framework
- 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
2010-11-02 08:06:06 +09:00
Gloria Wang
6793a04d62 Add support for WV plugin
Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
2010-10-29 16:44:37 -07:00
Gloria Wang
a784d4ed25 Do not create drm directory here. Fix for bug 3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
2010-10-26 12:11:55 -07:00
Takeshi Aimi
dc549d60f9 Update of DRM framework.
- 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
2010-10-04 22:14:53 +09:00
Joe Onorato
b01e10c5bc There is no @note javadoc tag.
Change-Id: I4bb4e0be518b01f2a81d870ff4ec9da81555afbd
2010-09-16 17:00:42 -04:00
Jean-Baptiste Queru
3802949f5c Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
2010-09-10 12:46:57 -07:00
Jean-Baptiste Queru
beeb71dfd4 fix build
Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
2010-09-09 16:16:14 -07:00
Jean-Baptiste Queru
862438eb69 fix build
Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846
2010-09-09 16:10:32 -07:00
Jean-Baptiste Queru
7547b8eac6 fix build
Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
2010-09-09 16:02:22 -07:00
Jean-Baptiste Queru
93548db645 fix build
Change-Id: I603e317b774758add127d7fe386fd60dc16d3101
2010-09-09 15:34:27 -07:00
aimitakeshi
d074e30ce4 Initial contribution from Sony Corporation.
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
2010-09-01 15:40:00 +09:00