5c13341b43merge in jb-release history after reset to master
The Android Automerger
2012-01-30 07:06:57 -08:00
beb9b7b603Add support to query through DrmInfoRequest::TYPE_REGISTRATION_INFO to check if a device is provisioned.
Edwin Wong
2012-01-25 17:13:57 -08:00
c3949b1967Changed license headers from AOSP to Google copyright
Jeff Tinker
2012-01-24 12:01:16 -08:00
9a8f1ac37fmerge in ics-release history after reset to master
The Android Automerger
2012-01-24 07:02:15 -08:00
c634a709f9am 65d4c7ab: Fix security hole and hang on movie playback
Jeff Tinker
2012-01-23 09:18:02 -08:00
d3c089fe70am 65d4c7ab: Fix security hole and hang on movie playback
Jeff Tinker
2012-01-20 12:08:59 -08:00
65d4c7ab20Fix security hole and hang on movie playback
Jeff Tinker
2012-01-20 10:17:58 -08:00
65ba93bcd1merge in ics-release history after reset to master
The Android Automerger
2012-01-18 07:02:15 -08:00
ec3d3d9f47Remove excessive warning log message from IsWidevineMedia() method
James Dong
2012-01-17 10:52:11 -08:00
54a31aa871merge in ics-release history after reset to master
The Android Automerger
2012-01-17 07:03:51 -08:00
9fd21a7798Implement WV side of the separation of sniffing and decrypt session initialization.
James Dong
2012-01-10 08:26:13 -08:00
1a67b379acmerge in ics-release history after reset to master
The Android Automerger
2012-01-10 07:03:03 -08:00
6a58f84d71merge in ics-release history after reset to master
The Android Automerger
2012-01-09 07:04:03 -08:00
7284b7e7f3Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Steve Block
2012-01-08 10:17:01 +00:00
b443024341Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
Steve Block
2012-01-05 14:08:24 -08:00
07db2b783bmerge in ics-release history after reset to master
The Android Automerger
2012-01-05 07:02:17 -08:00
ddf87803c7am f66301bd: Report correct decrypted video length to OMX codec
Jeff Tinker
2012-01-04 21:51:51 -08:00
c9c2ebc9bfam f66301bd: Report correct decrypted video length to OMX codec
Jeff Tinker
2012-01-04 13:21:47 -08:00
8d8df85113Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Steve Block
2012-01-04 20:06:42 +00:00
efe632956dRename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Steve Block
2011-12-20 16:24:34 +00:00
f66301bddbReport correct decrypted video length to OMX codec
Jeff Tinker
2011-12-16 07:18:32 -08:00
7e2f1dd588merge in ics-release history after reset to master
The Android Automerger
2011-12-15 07:02:19 -08:00
4b10b77fa1am 444dc2a8: Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.
James Dong
2011-12-14 13:53:32 -08:00
3b4e1f62dbam 444dc2a8: Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.
James Dong
2011-12-14 13:50:16 -08:00
444dc2a845Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.
James Dong
2011-12-14 11:05:53 -08:00
3b9e8d70abmerge in ics-release history after reset to master
The Android Automerger
2011-12-13 07:02:29 -08:00
e6aa26e7cfam c00a26a0: Fix OMX codec error playing Widevine content on Nexus S
Jeff Tinker
2011-12-12 15:39:25 -08:00
f9bda12fb3am c00a26a0: Fix OMX codec error playing Widevine content on Nexus S
Jeff Tinker
2011-12-12 11:22:39 -08:00
c00a26a05fFix OMX codec error playing Widevine content on Nexus S
Jeff Tinker
2011-12-12 10:01:37 -08:00
ceae33195fmerge in ics-release history after reset to master
The Android Automerger
2011-12-12 07:03:19 -08:00
e314afcb95am 95d4dc77: Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker
2011-12-09 14:25:42 -08:00
a7b87a13f7am 95d4dc77: Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker
2011-12-08 00:14:38 -08:00
95d4dc7776Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker
2011-12-07 20:28:03 -08:00
4709d20db0merge in ics-release history after reset to master
The Android Automerger
2011-11-16 07:03:47 -08:00
01663c7e99am 94edc18b: Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
Edwin Wong
2011-11-15 18:25:27 -08:00
cfe6d80c2dam 94edc18b: Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
Edwin Wong
2011-11-15 18:01:17 -08:00
94edc18bdeFixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
Edwin Wong
2011-11-15 09:45:56 -08:00
9d8aa491fbmerge in ics-release history after reset to master
The Android Automerger
2011-11-14 07:01:30 -08:00
b2ecb1899eam e8951bc6: Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
Edwin Wong
2011-11-13 16:27:59 -08:00
3236ad55c5am e8951bc6: Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
Edwin Wong
2011-11-13 16:26:10 -08:00
2af6071dffmerge in ics-release history after reset to master
The Android Automerger
2011-11-13 07:04:45 -08:00
e8951bc684Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
Edwin Wong
2011-11-10 17:19:33 -08:00
2987f9b71fam 523caa4c: Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1
Edwin Wong
2011-11-10 19:39:26 +00:00
2f6a27e20fam d8e21430: Merge "Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end." into ics-mr1
Edwin Wong
2011-11-10 19:39:25 +00:00
b71151ce43am 523caa4c: Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1
Edwin Wong
2011-11-10 15:13:45 +00:00
53067679d2am d8e21430: Merge "Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end." into ics-mr1
Edwin Wong
2011-11-10 15:12:07 +00:00
523caa4c94Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1
Edwin Wong
2011-11-10 07:11:49 -08:00
d8e2143022Merge "Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end." into ics-mr1
Edwin Wong
2011-11-10 07:09:58 -08:00
9756123106merge in ics-release history after reset to master
The Android Automerger
2011-11-10 07:03:23 -08:00
b860f7ab7eam 5fe2e2fd: Upload Ed Schacker\'s fix for ANR on expired assets
Jeff Tinker
2011-11-09 14:34:20 +00:00
67ec23c8b9am 5fe2e2fd: Upload Ed Schacker\'s fix for ANR on expired assets
Jeff Tinker
2011-11-08 18:17:21 +00:00
662dced941Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197
Edwin Wong
2011-11-03 09:27:53 -07:00
5fe2e2fdb7Upload Ed Schacker's fix for ANR on expired assets
Jeff Tinker
2011-11-01 10:16:50 -07:00
111050c07dAdjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end.
Edwin Wong
2011-10-28 13:45:14 -07:00
3c5851ed9fkeep previous history after reset to mr1 plus aah changes (ics-aah-wip)
Ed Heyl
2011-10-28 19:06:08 +00:00
9905bc8f11undo reset to ics-mr1 until we have a better method
Ed Heyl
2011-10-26 21:53:31 +00:00
790c1ec177reset to ics-mr1, but keep history
Ed Heyl
2011-10-26 18:50:37 +00:00
ca5f1e9a9cmerge in ics-release history after reset to master
The Android Automerger
2011-10-26 09:56:56 -07:00
96a0122828am 6482fc32: am 80daed61: am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff
Jeffrey Tinker
2011-10-26 08:28:45 -07:00
6482fc3269am 80daed61: am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff
Jeffrey Tinker
2011-10-26 15:27:19 +00:00
80daed61a5am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff
Jeffrey Tinker
2011-10-26 12:22:45 +00:00
6f620256c7am 1f580277: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
Steve Block
2011-10-26 04:48:05 -07:00
82d675f15d[DRM] Terminate HTTPClient thread after content type sniff
Jeffrey Tinker
2011-10-25 18:33:47 -07:00
1f5802779bRename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
Steve Block
2011-10-20 11:56:15 +01:00
a422cede1dmerge in ics-release history after reset to master
The Android Automerger
2011-10-23 07:05:16 -07:00
c2f26b79d4Merge "Include a dummy jar in widevine distribution."
Jeff Tinker
2011-10-20 09:57:00 -07:00
15ed6a98f2merge in ics-release history after reset to master
The Android Automerger
2011-10-20 07:04:35 -07:00
f27dd7f355am ddf12aa7: Merge "Fix segfault during Widevine playback on switch between .wvm and live" into ics-mr0
James Dong
2011-10-20 01:52:55 -07:00
6a6b8ece97am e8ab892b: (-s ours) Include a dummy jar in widevine distribution.
Bryan Mawhinney
2011-10-20 01:52:55 -07:00
ddf12aa7a6Merge "Fix segfault during Widevine playback on switch between .wvm and live" into ics-mr0
James Dong
2011-10-20 01:49:10 -07:00
073b6b2008Fix segfault during Widevine playback on switch between .wvm and live
Jeffrey Tinker
2011-10-20 01:03:25 -07:00
163d39278fInclude a dummy jar in widevine distribution.
Bryan Mawhinney
2011-09-27 18:18:19 +01:00
e8ab892b7eInclude a dummy jar in widevine distribution.
Bryan Mawhinney
2011-09-27 18:18:19 +01:00
782380915eFix playback failure on sample HD 1080p Widevine DRM content
Jeffrey Tinker
2011-10-19 20:26:44 -07:00
7cc8cb25d2Fixed always getting -1004 error and "Connection to server lost" on long seek bugs. Includes Widevine release libs version 4.5.0.4957.
Edwin Wong
2011-10-19 12:41:50 -07:00
ed2083b96amerge in ics-release history after reset to master
The Android Automerger
2011-10-19 07:45:47 -07:00
23327bdb66Merge "Fix incorrect error returns from DRM plugin" into ics-mr0
Jeffrey Tinker
2011-10-18 19:14:58 -07:00
b8e24ebb0bmerge in ics-release history after reset to master
The Android Automerger
2011-10-18 07:03:38 -07:00
bcfe38dcb0Fix failure to play through the end of wv videos
Jeff Tinker
2011-10-13 10:06:42 -07:00
1fee8fd75aInstall proprietary userspace modules under /vendor. BUG: 5284436
Edwin Wong
2011-10-12 14:36:21 -07:00
11f6c16945merge in ics-release history after reset to master
The Android Automerger
2011-10-09 07:03:14 -07:00
f5fa8f2017Changes for calling the level 1 decrypt callout
Jeffrey Tinker
2011-08-30 17:59:53 -07:00
f271975161Revert "Install proprietary userspace modules under system/vendor. BUG: 5284436"
Edwin Wong
2011-09-22 17:08:37 -07:00
ceac204c61Revert "Install proprietary userspace modules under system/vendor. BUG: 5284436"
Edwin Wong
2011-09-22 17:08:37 -07:00
784469b355Install proprietary userspace modules under system/vendor. BUG: 5284436
Edwin Wong
2011-09-15 10:03:53 -07:00
6aaee145d8Additional changes for b/5081725 as per code review by Jeff Tinker. Missed allocating buffer for HLS case. BUG: 5081725
Edwin Wong
2011-09-12 13:57:57 -07:00
ba14720f8eWidevine HLS live stream support for L1 secure playback. Check in for Jeff Tinker. BUG 5081725
Edwin Wong
2011-09-08 15:11:37 -07:00
758456e6c7Merge "Restructured libwvm.so build. It is now built under vendor/device/.../liboemcrypto/ because of dependencies on liboemcrypto.a, which cannot be linked by platform-independant code."
Edwin Wong
2011-09-06 10:43:45 -07:00
78a88a014fstrip the widevine prebuilt .so's
Doug Zongker
2011-09-02 16:15:05 -07:00
df9a3d4cc3Restructured libwvm.so build. It is now built under vendor/device/.../liboemcrypto/ because of dependencies on liboemcrypto.a, which cannot be linked by platform-independant code.
Edwin Wong
2011-09-02 12:17:22 -07:00
766d206a31Address 5069044: non rooted device getting error 49. This error is hard to reproduce, it can be caused by file system error at boot; with this change, the drm will reprovision the device when the file system error occurs.
Edwin Wong
2011-09-01 19:35:26 -07:00
4105c3c146Fix for build break - trygon image size too large.
Jeff Tinker
2011-08-13 07:38:26 -07:00
9e8923789eSome restructuring of the build was required to support the different OEM security levels used on tuna vs stingray & crespo. This is part of the work for b/4598045 Implementing secure video path on TI OMAP4 chip for ICS.
Jeff Tinker
2011-08-06 22:26:11 -07:00
fa7e3b620aFixed 4271507: updated asset url, portal name and EMM url.
Edwin Wong
2011-08-10 11:48:10 -07:00
ebeacef015Merge "UI changes for smaller devices and GTV. Fix for defect 4616102."
Yohann Connell
2011-08-04 12:52:53 -07:00
7c45fff99aFixed 3510047: MediaPlayer ANR if play or seek past end of file.
Edwin Wong
2011-08-03 15:43:08 -07:00
baebdacb0aUI changes for smaller devices and GTV. Fix for defect 4616102.
Yohann Connell
2011-07-27 06:57:26 -07:00
851009ab73Merge "UI changes for smaller devices and GTV. Fix for defect 4616102."
Yohann Connell
2011-07-27 08:59:30 -07:00