13 Commits

Author SHA1 Message Date
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