Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,404 Commits 3 Branches 0 Tags
449d6435caa759cd1c2d68308ff282f016bb403c
Commit Graph

38 Commits

Author SHA1 Message Date
Li Chen
21c998f1e9 Remove the field of MediaDrm from inner class CryptoSession. 
As CryptoSession is an inner (non-static) class of MediaDrm,
it's not necessary to pass in a reference of MediaDrm while
creating a CryptoSession instance.


bug: 27607931

Change-Id: Ic3cc03f885d14bc8d93287c918e778550cc21b58
 2016-03-11 16:35:06 +00:00
Jeff Tinker
dade24c12a Remove unused MediaDrm.unprovisionDevice 
bug:25726218
Change-Id: Ibbd51aaa1ee4c21c9ec8b162fc6e378ab7ba6e7b
 2015-12-09 09:02:31 -08:00
Jeff Tinker
314b7f3af3 Improve robustness of MediaDrm after mediaserver crash 
If DEAD_OBJECT is returned from binder calls due to
mediaserver crash, throw new MediaDrmResetException.
This allows the app to detect the condition and handle
it properly.

bug: 20614102
Change-Id: Id08b08fb612672fd94383f0470f5fa3f267b944f
 2015-06-17 09:32:58 -07:00
Jeff Tinker
08cfe2a5fc Doc update for MediaDrm's OnExpirationUpdate method 
Based on EME spec clarification that expiration time
of 0 means unlimited.

bug: 21393975
Change-Id: I96e50fb4300724f52aad2ca39c8495ad1aa78222
 2015-05-22 20:17:57 +00:00
Jeff Tinker
5ffbae6492 MediaDrm API Updates per api council review 
bug: 21044671

Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
 2015-05-15 01:44:59 +00:00
Lajos Molnar
99f8072386 media: add annotations to low-level Media* classes 
Also remove explicit runtime exception added to
MediaExtractor.setDataSource, as other methods don't
explicitly declare it.

Includes MediaCodec, Crypto, Drm, Extractor, Muxer, Sync.

Bug: 19756615
Bug: 19967103
Bug: 16906375
Change-Id: If511d85af7f61808fbe63fbdc6e04a3d2e7e262c
 2015-04-22 09:44:03 -07:00
Jeff Tinker
74797f843c Add expiration update and keys change events 
In support of unprefixed EME

bug: 19771612
bug: 19771431
Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50
 2015-04-09 22:44:36 +00:00
Jeff Tinker
3910eb551c Merge "Note in docs that MediaDrm methods throw IllegalStateException" 2015-03-24 00:10:21 +00:00
Jeff Tinker
4cdc2de0e4 Report key request message type for unprefixed EME 
bug: 19771299
Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
 2015-03-23 16:23:12 -07:00
Jeff Tinker
5ce85b99b3 Note in docs that MediaDrm methods throw IllegalStateException 
Also fixes incorrect documention where ResourceBusyException can't
be thrown

bug: 18285793
Change-Id: I52d782a772aed97d32e70d7505c48540a320ca07
 2015-03-13 16:10:45 -07:00
Jeff Tinker
7c8d999f42 Deprecate redundant event, should handle via NotProvisionedException 
bug: 12033385
Change-Id: I02103f3fd9f48f57113bb248891fc1c8f0d8a248
 2015-03-13 14:45:17 -07:00
Ronghua Wu
67cf4a06c7 Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager." 2015-03-12 18:05:47 +00:00
Ronghua Wu
a6d72095ed drm: add EVENT_SESSION_RECLAIMED for resource manager. 
Bug: 19265536
Change-Id: Ifa15a4c7d3a7c20cb00bd4aefb57d239c0efaafa
 2015-03-04 15:26:42 -08:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
Jeff Tinker
846e712dc7 Unhide secure stop APIs 
Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c
related-to-bug: 18053197
related-to-bug: 18076411
 2014-12-05 15:44:17 -08:00
Jeff Tinker
1b51c72e91 Add missing secure stop methods 
b/18053197
b/18076411

Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
 2014-11-03 16:22:04 -08:00
Jeff Tinker
21069d1914 Implement API review feedback. 
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
 2014-09-23 01:35:41 +00:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo 
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
 2014-09-09 17:27:26 -07:00
Jeff Tinker
6bf5b600d6 Allow device to be unprovisioned 
bug: 12247651
Change-Id: Ie2e77566d2c65925091296da5bcbec327985c946
 2014-08-01 17:16:01 +00:00
Jeff Tinker
3b6ec30bff Fix exception discrepancy in MediaDrm.openSession 
bug: 13792521
Change-Id: I2e47ce754c1e560315bf2bf1144d94e01472e392
 2014-06-25 17:20:33 +00:00
Jeff Tinker
d712e1a387 Add diagnostic error code to MediaDrm IllegalStateExceptions 
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
 2014-06-20 13:41:30 -07:00
Jeff Tinker
9de8c1d82b resolved conflicts for merge of 4f342e87 to master 
Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
 2014-04-03 11:51:37 -07:00
Jeff Tinker
53c90cf916 am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 
* commit '6dc8063d2a06017f249181b4b5b07c54ce645943':
  Support CAST V2 Authentication in MediaDrm
 2014-04-01 22:23:21 +00:00
Jeff Tinker
e4095a80b6 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
 2014-04-01 14:25:35 -07:00
Elliott Hughes
36d10e7994 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
 2013-12-16 23:27:39 +00:00
Ashok Bhat
656fd04026 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>
 2013-12-10 18:10:47 +00:00
John Spurlock
6090995951 Remove unused imports from frameworks/base. 
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
 2013-11-20 11:31:47 -05:00
Jeff Tinker
7cda491321 Add ability to test supported content types to MediaDrm 
bug: 10244066
Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
 2013-08-21 17:30:06 -07:00
Jeff Tinker
3ed38266c1 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
 2013-08-03 10:23:41 -07:00
Jeff Tinker
ea824eddbc Correct java API docs for MediaDrm offline use case 
Documentation only change, no APIs are affected

Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b
related-to-bug: 8621588
 2013-05-07 15:01:07 -07:00
Jeff Tinker
1d7c218ba2 MediaDrm API: Add two exceptions to handle error path scenarios 
bug: 8725707
Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
 2013-04-30 12:39:04 -07:00
Kenny Root
b5ec8c145d Change doc comment to match API change 
API change in f0d4777473 didn't update a
comment to match which caused doc build failures.

Bug: 8603279
Change-Id: I475dc569747ae5d34b4267537370f18446386bb9
 2013-04-19 16:57:09 -07:00
Jeff Tinker
f0d4777473 Correct algorithm property name and clarify javadoc description of 
device unique id property.

bug: 8603279
Change-Id: If56d568072b3c09e5f63901e285d0eaa3c77ff7a
 2013-04-19 10:04:17 -07:00
Jeff Tinker
e1c76bebef Make MediaDrm APIs public 
bug: 8603279

Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
 2013-04-17 15:24:48 -07:00
Jeff Tinker
d8bbfc2750 Clarify how release of offline keys is handled in the MediaDrm API 
bug: 8603820

Change-Id: Ifeda018fbbbb9905e62ee242da2ede1ed89868a2
 2013-04-12 09:57:43 -07:00
Jeff Tinker
54cfbd6dc2 Implement async event callout from drm plugin to Java app 
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
 2013-04-03 12:01:59 -07:00
Jeff Tinker
16b8cffb28 MediaDrm API update 
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
 2013-04-01 21:59:35 -07:00
Jeff Tinker
8a0c80fdcc Implementing MediaDrm APIs 
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
 2013-03-13 13:40:56 -07:00