| 846e712dc72c0721131413bcae48f3d8b923411b |
|
19-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
Unhide secure stop APIs
Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c
related-to-bug: 18053197
related-to-bug: 18076411
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 1b51c72e910a91e79efe34c6252e01862516e73d |
|
31-Oct-2014 |
Jeff Tinker <jtinker@google.com> |
Add missing secure stop methods
b/18053197
b/18076411
Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 21069d1914ae7ef07e3edf6bea435e7569f28d64 |
|
23-Sep-2014 |
Jeff Tinker <jtinker@google.com> |
Implement API review feedback.
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
/frameworks/base/media/java/android/media/MediaDrm.java
|
| d7e5f680fa64b76c3d1c2a67572896705a0588ed |
|
10-Sep-2014 |
Lajos Molnar <lajos@google.com> |
MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 6bf5b600d6d1e98f7eabbbc884dd286b335acd66 |
|
30-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Allow device to be unprovisioned
bug: 12247651
Change-Id: Ie2e77566d2c65925091296da5bcbec327985c946
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 3b6ec30bff1749766a0d25770aa42d3a013c09d3 |
|
30-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Fix exception discrepancy in MediaDrm.openSession
bug: 13792521
Change-Id: I2e47ce754c1e560315bf2bf1144d94e01472e392
/frameworks/base/media/java/android/media/MediaDrm.java
|
| d712e1a387f06fedb33d083730d279b26ed5e399 |
|
19-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Add diagnostic error code to MediaDrm IllegalStateExceptions
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 9de8c1d82b6bf2b70e854a3349c9f1da60a23e83 |
|
03-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
resolved conflicts for merge of 4f342e87 to master
Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 53c90cf916ddd1151f042a61a569ea75a220b26e |
|
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
* commit '6dc8063d2a06017f249181b4b5b07c54ce645943':
Support CAST V2 Authentication in MediaDrm
|
| e4095a80b674642e0e0e8f0883dee3b22f32f19a |
|
04-Mar-2014 |
Jeff Tinker <jtinker@google.com> |
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 36d10e79940fcb0c9ddd9780062065dc633971fb |
|
17-Dec-2013 |
Elliott Hughes <enh@google.com> |
am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '3bfc6e76e627d4122a774488f36fb843bb3694fb':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
|
| 656fd0402613cec0196d5e2ae0a460d044d2805b |
|
28-Nov-2013 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in MediaDrm and MediaMuxer
For storing pointers, long is used in MediaDrm and
MediaMuxer classes, as native pointers can be 64-bit.
Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 6090995951c6e2e4dcf38102f01793f8a94166e1 |
|
19-Nov-2013 |
John Spurlock <jspurlock@google.com> |
Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 7cda491321b9bd2e8faf956824312ea6a30e6457 |
|
21-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 3ed38266c1647c6219ae5ad89cb3f867cf66caaa |
|
03-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Define error codes for MediaCodec.CryptoException
Define specific failure cases so apps have the information they
need to deal with these conditions.
Also adds a new ResourceBusyException to MediaDrm
Change-Id: Iaecf269d58108f28179974b05671bf29b9fe4b7d
related-to-bug: 10157154
related-to-bug: 9695816
/frameworks/base/media/java/android/media/MediaDrm.java
|
| ea824eddbcaf24cde1c2388ff73e7c5c5e4afb26 |
|
07-May-2013 |
Jeff Tinker <jtinker@google.com> |
Correct java API docs for MediaDrm offline use case
Documentation only change, no APIs are affected
Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b
related-to-bug: 8621588
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 1d7c218ba23185c58ae27f59e4ec6b8526b2d04a |
|
26-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API: Add two exceptions to handle error path scenarios
bug: 8725707
Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
/frameworks/base/media/java/android/media/MediaDrm.java
|
| b5ec8c145d467abbc6eaf3306a5f6725e348ceec |
|
20-Apr-2013 |
Kenny Root <kroot@google.com> |
Change doc comment to match API change
API change in f0d4777473f25847d67fc17fc082fada08cf678d didn't update a
comment to match which caused doc build failures.
Bug: 8603279
Change-Id: I475dc569747ae5d34b4267537370f18446386bb9
/frameworks/base/media/java/android/media/MediaDrm.java
|
| f0d4777473f25847d67fc17fc082fada08cf678d |
|
19-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Correct algorithm property name and clarify javadoc description of
device unique id property.
bug: 8603279
Change-Id: If56d568072b3c09e5f63901e285d0eaa3c77ff7a
/frameworks/base/media/java/android/media/MediaDrm.java
|
| e1c76bebef41d362369627ed0c06ea9a01c6bddb |
|
04-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Make MediaDrm APIs public
bug: 8603279
Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
/frameworks/base/media/java/android/media/MediaDrm.java
|
| d8bbfc2750fa24a0374dd3525d2759692e6b9285 |
|
12-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Clarify how release of offline keys is handled in the MediaDrm API
bug: 8603820
Change-Id: Ifeda018fbbbb9905e62ee242da2ede1ed89868a2
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 54cfbd6dc28334119c33b6a77779bfe244c71e69 |
|
02-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Implement async event callout from drm plugin to Java app
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 16b8cffb2893c10c35788191847500004da466d1 |
|
31-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
/frameworks/base/media/java/android/media/MediaDrm.java
|
| 8a0c80fdcc46faa8cb8c9f4dda06f4b63ec2f906 |
|
08-Feb-2013 |
Jeff Tinker <jtinker@google.com> |
Implementing MediaDrm APIs
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
/frameworks/base/media/java/android/media/MediaDrm.java
|