| 4fe73b54b4e44cee7ebed99fb171c1368298c5d9 |
08-Oct-2014 |
Chih-Hung Hsieh <chh@google.com> |
am ac4d8b31: am 6ade0417: Merge "Remove dead code."
* commit 'ac4d8b31d4c7785ccaed28977e05e158d554ce38':
Remove dead code.
|
| f4a4c1da7e9d5086374216a6a57334b09c208f31 |
07-Oct-2014 |
Chih-Hung Hsieh <chh@google.com> |
Remove dead code.
BUG: 17364950
Change-Id: I7c55fd918a8c0d1a3375807eaece9ae9176ffeea
lugInManager.h
|
| d0eda851b7cb5566ac7078c73c3d3bde4d68d1b1 |
26-Sep-2014 |
Glenn Kasten <gkasten@android.com> |
am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"
* commit '3a94ca562e6a57cf324a8b8165b596ad61f7a20d':
Fix comparison of String8 to char* literal
|
| f129e84addb1b0ba1240f39430404dad717c21c2 |
18-Sep-2014 |
Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> |
Fix comparison of String8 to char* literal
Clang (correctly) interprets
if ("." == sName)
as
if ("." == (const char*)sName)
and recognizes that comparing the pointers isn't what was meant.
With
if (sName == ".")
both clang and gcc see and use String8::operator==(const char *),
ensuring we get the wanted behavior.
Change-Id: Ide240e13214a56f6899f72de3db75dac647e6d4b
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
lugInManager.h
|
| 7045f37119f70c24eeea0624bfc8e25a2f9629a5 |
26-Jul-2014 |
Nick Kralevich <nnk@google.com> |
am bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService."
* commit 'bb5b41a39f7e93a8df444ae0a1c71495531d265e':
Add SELinux MAC to DrmManagerService.
|
| f785f497567ea9d55ade92cbf82a7e80eeb5cb82 |
02-Jul-2014 |
Riley Spahn <rileyspahn@google.com> |
Add SELinux MAC to DrmManagerService.
Add SELinux checks on all interfaces exposed by the
DrmManagerService.
Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
rmManagerService.h
|
| 4299a7c2b049b07b3456a81a4c2b1030523c08ca |
09-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '940f8be3619cecda66dad33f995904795df88c2d':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
|
| 927634a98167e24241b89d80a1ea4511c0bb9cd1 |
05-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
rmManagerClientImpl.h
oOpDrmManagerClientImpl.h
|
| 3ab368e0810d894dcbc0971350c095049478a055 |
15-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
media: use size_t for integer iterator to Vector::size()
Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
lugInManager.h
|
| f355f18aa2cc1706761e373fe19298a9ccc9c75a |
23-Jul-2013 |
Jeff Tinker <jtinker@google.com> |
Remove obsolete drm manager code
bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| 13f7fe763b9ad52fc27f21ed923c46b9555a321f |
26-Oct-2012 |
Henrik B Andersson <henrikb.andersson@sonymobile.com> |
Fix for not ending up in an eternal loop in DrmManager.
In the original code a random number is used to get try
to find an empty slot in the list of free DRM id's.
When you reached the limit of 0xfff id's you ended up
in an eternal loop causing ANRs.
Updated by James Dong <jdong@google.com>.
Change-Id: I70176cc3f770223c4a8060f9739fe2bc03a703d9
rmManager.h
|
| bf5b3b29e31b293313788d7464cfb258ac0da803 |
31-Jul-2012 |
James Dong <jdong@google.com> |
Let getOriginalMimeType() take a fd passed from drm java applications
This patch enables the drm framework to avoid opening files directly.
As a result, the drm framework no longer needs the sdcard read permision.
o related-to-bug: 6426185
Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| cba7b32d8f2c47632313f54118ed3733b4b02cc8 |
18-Jan-2012 |
Kei Takahashi <KeiA.Takahashi@jp.sony.com> |
Add a new API on DRM Framework for streaming
In case of DRM streaming, decrypt session can start just after
receiving the header, and it doesn't need to wait for the entire
content. However, current API of DRM framework only accepts file
handle or URI. With this new API, DRM session can start
without waiting for the entire content.
Changes are made by SEMC and Sony.
Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| 9d2f386dd2885eaffa11fd494ae258bb09fe6397 |
10-Jan-2012 |
James Dong <jdong@google.com> |
Separate sniffing from session initialization
This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened
o The change is backward compatibile in that no update is required
for existing drm plug-ins if they do not plan to provide separate
sniffer/extractor
related-to-bug: 5725548
Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| 8f00151cbe693d52f3e233757c57fab3b6396d21 |
22-Jul-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4371230.
- 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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| c10ce33302f91896fc2a87c13b00518a4bc26e3a |
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
lugInManager.h
|
| 1006c80903c4e6b0554a3bc2e3585639c395927d |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Bug fixes of DRM framework."
|
| 99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 |
15-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
Bug 4016329 do full string comparisons
|
| 8d2577b9ac2f95f218db59a78447efd3c6a742dd |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
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
rmManager.h
rmManagerClientImpl.h
DrmManagerService.h
|
| 8635b7b095fbf7ffc63d3ce791891a9116ace1f6 |
15-Mar-2011 |
James Dong <jdong@google.com> |
Add memory leak tracking/debugging code to drm server
bug - 4099038
Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
rmManagerService.h
|
| 41b3d3be18b54e72a44813cbdd180aae7e77b444 |
14-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
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
lugInManager.h
tringTokenizer.h
|
| 1825ce2475d4cbed336ddb779ab5acb09d9a155c |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of c761a80d to master
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
|
| 0e0a5f9e0b7a7ca618e8a1f7ccecc57a17e0d1e2 |
11-Mar-2011 |
Gloria Wang <gwang@google.com> |
- 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
rmManager.h
|
| b5ce361d19e69fe156f7188c9ee0f4734b259874 |
25-Feb-2011 |
Gloria Wang <gwang@google.com> |
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
rmManagerClientImpl.h
|
| 44482001e106cfb7389110f869ddae381f8a2da7 |
21-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3361124 Remove drmioserver, continued
Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
rmIOService.h
DrmIOService.h
|
| 6dc4726e7fa14e4006f6790c6f1ba02cfe888870 |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
|
| a2cd44cb5067b4fe98794860690394254d3ac73c |
20-Nov-2010 |
Gloria Wang <gwang@google.com> |
64-bit file size/offset support for DRM framework
Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| 3473846f64f5b28e1cbeb70ef5867073fc93159e |
16-Nov-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| e943f84129326ab885cc7a69dcfa17f766b72b89 |
08-Oct-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
| 2272ee27d9022d173b6eab45c409b3c3f57f30ec |
20-Sep-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
eadWriteUtils.h
|
| 27ed8ad2db653f6ac07dcf8bcc05e2409c8bb024 |
29-Jul-2010 |
aimitakeshi <aimitakeshi@gmail.com> |
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
rmIOService.h
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmIOService.h
DrmManagerService.h
DrmServiceListener.h
lugInManager.h
eadWriteUtils.h
tringTokenizer.h
|