| f64686f3b8c5100e114974038d0b2bb215d9bcd9 |
|
19-May-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix misc-macro-parentheses warnings." am: 64d4f64af0
am: 5405ce02c4
* commit '5405ce02c45b55c0ba12fd3131ae329506e91f94':
Fix misc-macro-parentheses warnings.
Change-Id: I94cd974549d819d7a43733636ecd4a6e464b76eb
|
| 92c6b825ad27e790b5ebd7076bd9b9ef3d5815ce |
|
18-May-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix misc-macro-parentheses warnings.
Bug: 28705665
Change-Id: I1ad468741c6f117817099d2ba87374dce2b776a9
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 5a8dbe7ad39fbfb9076894dcd24c596aae2cfccb |
|
23-Jun-2014 |
Mark Salyzyn <salyzyn@google.com> |
drm: unused argument warning messages
Change-Id: Ifd8a470ffa02f986427c5f36380d70494efe864d
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| c52ca479388f4b98da4a25850f552f9c54ccc1d2 |
|
12-Feb-2016 |
Aurimas Liutikas <aurimas@google.com> |
Suppress unused parameter warnings in libdrmframework.
This change also enables -Werror flag that causes
all warning to fail this target's build to prevent regressions.
Bug: 27151704
Change-Id: I5d815d20aea151eb40292b8e2bffb144240413a2
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 06b46062d2f8bc82ca3061a23d197734ae51918b |
|
14-Nov-2014 |
Marco Nelissen <marcone@google.com> |
Update calls to IInterface::asBinder()
to use the new static version.
Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 927634a98167e24241b89d80a1ea4511c0bb9cd1 |
|
05-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| f355f18aa2cc1706761e373fe19298a9ccc9c75a |
|
23-Jul-2013 |
Jeff Tinker <jtinker@google.com> |
Remove obsolete drm manager code
bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 5ff1dd576bb93c45b44088a51544a18fc43ebf58 |
|
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| ab00df4d8585b181e9058eb1b9c7996aa3bbaeab |
|
22-Jun-2011 |
Gloria Wang <gwang@google.com> |
- Add two sanity checks.
- Remove one unnecessary line.
- Clear the extendedData vector in DecryptHandle.
Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| ac2652c25f5d2a38709131f7731651bc5819fed5 |
|
11-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."
* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
DRM Framework bug fixes.
|
| c618b5af98dec06d49374a61a5a94016f9fec2d3 |
|
30-Nov-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|
| 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
/frameworks/av/drm/libdrmframework/DrmManagerClientImpl.cpp
|