Gloria Wang
2980a21375
-Fix some typo
...
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
2011-06-15 17:32:06 -07:00
Gloria Wang
cbe0d94adf
Duplicated fileDesc is not closed when input file is not forward-lock content.
...
Fix for bug 4606053.
Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
2011-06-13 16:29:38 -07:00
James Dong
3f0341cbbd
Fix memory leak from retrieval of getSupportedDrmInfo.
...
Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
2011-04-24 12:40:16 -07:00
Gloria Wang
503b111b24
am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
...
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:11:49 -07:00
Gloria Wang
4c87a75073
Fix for bug 4126624.
...
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
2011-03-24 13:14:02 -07:00
Gloria Wang
9e1e9a339e
Fix for bug 4165823.
...
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.
Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
2011-03-24 10:30:57 -07:00
Bill Gruber
f46821b9d9
am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change 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
2011-03-23 16:00:30 -07:00
Bill Gruber
0357ec78b8
Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
2011-03-23 14:58:31 -07:00
Bill Gruber
0e092f806b
DRM API doc scrub
...
This change contains information contributed by Sony Corporation.
Bug: 4119363
Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
2011-03-23 13:21:48 -07:00
Carl Shapiro
5c62d9961d
Merge "Include strings.h for the strcasecmp prototype."
2011-03-22 16:18:38 -07:00
Carl Shapiro
39ad826d2e
Include strings.h for the strcasecmp prototype.
...
Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
2011-03-22 11:51:57 -07:00
Gloria Wang
66044c1792
am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
...
* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
Add one more field in DecryptHandle to support bug 4126624
2011-03-22 11:43:09 -07:00
Gloria Wang
c430394ed7
Add one more field in DecryptHandle to support bug 4126624
...
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
2011-03-21 19:08:18 -07:00
Gloria Wang
ee4084bf06
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
...
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
2011-03-21 16:53:14 -07:00
Gloria Wang
3bbeaacfc0
Fix for 4084554.
...
DRM framework support for enabling/disabling copy control settings from a DRM plugin
Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
2011-03-21 13:50:04 -07:00
Gloria Wang
cfbe4369b3
Fix for bug 4126103.
...
mMessage in DrmInfoEvent is a reference to the message string, so the
temporary message created in the plugin was going out of scope and
being destructed while the message was being sent. Changed DrmInfoEvent's
mMessage to be const String8 instead of const String8&
Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
2011-03-17 15:02:34 -07:00
Gloria Wang
454b2d1c34
am 2c3257b2: am 9940c8b6: am def35f7a: Merge "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" 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
2011-03-17 12:38:40 -07:00
Gloria Wang
f8bf3c46f5
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
Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
2011-03-16 21:36:30 -07:00
Gloria Wang
0e5e2e2b2b
Merge "Bug fixes of DRM framework."
2011-03-15 14:10:30 -07:00
Glenn Kasten
e5eb43b5d9
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
...
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
Bug 4016329 do full string comparisons
2011-03-15 13:51:17 -07:00
Glenn Kasten
4528a7db38
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
2011-03-15 13:44:58 -07:00
Gloria Wang
5c96c65f69
Bug fixes of DRM framework.
...
- 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
2011-03-15 11:17:22 -07:00
James Dong
ed73246b32
Add memory leak tracking/debugging code to drm server
...
bug - 4099038
Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
2011-03-14 18:48:19 -07:00
Glenn Kasten
f8a1842e07
Bug 4016329 do full string comparisons
...
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
2011-03-14 17:59:51 -07:00
Gloria Wang
5c4421f73f
am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
...
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
For issue 4082089 Add more info and error events into the DRM framework
2011-03-14 17:41:42 -07:00
Gloria Wang
27b277779c
For issue 4082089
...
Add more info and error events into the DRM framework
Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
2011-03-14 15:29:08 -07:00
Iliyan Malchev
3070af0882
frameworks/base: remove LOCAL_PRELINK_MODULE
...
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:25:59 -07:00
Gloria Wang
09ba5cebb2
resolved conflicts for merge of c761a80d to master
...
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
2011-03-14 11:56:39 -07:00
Gloria Wang
192b591cdc
- Some change on the DrmManager in order to support feature request 4082089.
...
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
2011-03-11 14:54:23 -08:00
Gloria Wang
ae7752798a
Fix for bug 3477330
...
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer.
Fix by using sp<DecryptHandle> instead.
Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
2011-03-10 16:20:48 -08:00
Gloria Wang
54fe58562b
Merge "- 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" into honeycomb-mr1
2011-03-09 16:05:59 -08:00
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