widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,892 Commits 2 Branches 0 Tags
26bdf1cb7fee0c05d044b282c63959e75d5c91bb
Commit Graph

7892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
b12c4a93f4 Merge remote-tracking branch 'goog/ics-aah' 2012-04-03 10:15:22 -07:00
The Android Automerger
833a68a434 merge in jb-release history after reset to master 2012-04-03 03:39:35 -07:00
Jeff Tinker
ba32a8ddb8 Fix an intermittent issue with HLS live streaming 
An uninitialized return code was causing intermittent
playback failure during Widevine HLS live playback

Change-Id: Ib45176e7f91e2b6ccf0eb4185c6d58d3be0229b4
related-to-bug: 6277231
 2012-04-02 22:10:04 -07:00
Jeff Tinker
c8a09dfe42 Protect against rollover of LICENSE_START_TIME when clock is set back 
Contains Widevine library version 4.5.0.6480

Change-Id: I735d4a07c38f0eb781f7c5338229b179fdc3a550
related-to-bug: 6202995
 2012-03-30 17:12:12 -07:00
The Android Automerger
b139e89759 merge in jb-release history after reset to master 2012-03-29 08:24:40 -07:00
James Dong
e9ff127d78 Makefile change because media and drm header files are relocated 
o related-to-bug: 6214141

Change-Id: I5d5e4169eb05f75c19c1598e05b72e251b2899fb
 2012-03-23 21:51:16 -07:00
Jeff Tinker
79b8865e2c am c2f46759: (-s ours) DO NOT MERGE Fix Widevine HLS live streaming 
* commit 'c2f46759cc93e993100eb49f7c70b154e8ce033f':
  DO NOT MERGE Fix Widevine HLS live streaming
 2012-03-20 19:35:41 -07:00
The Android Automerger
9f4c07788d merge in jb-release history after reset to master 2012-03-19 07:11:01 -07:00
Jeff Tinker
df111fecda am c2f46759: DO NOT MERGE Fix Widevine HLS live streaming 
* commit 'c2f46759cc93e993100eb49f7c70b154e8ce033f':
  DO NOT MERGE Fix Widevine HLS live streaming
 2012-03-16 18:54:05 -07:00
Jeff Tinker
c2f46759cc DO NOT MERGE Fix Widevine HLS live streaming 
Change-Id: I566b693f7f0e9a7b7c8111fb654f79bcd927e02d
related-to-bug: 6178393
 2012-03-16 18:22:17 -07:00
Jeff Tinker
f71be04d59 Merge "Fix Widevine HLS live streaming" 2012-03-16 12:15:51 -07:00
Jeff Tinker
c5a49d2e73 Fix Widevine HLS live streaming 
Change-Id: I566b693f7f0e9a7b7c8111fb654f79bcd927e02d
related-to-bug: 6178393
 2012-03-15 17:34:58 -07:00
The Android Automerger
e1ce674d7b merge in jb-release history after reset to master 2012-03-12 07:11:00 -07:00
Jeff Tinker
835420c31d Fix videos app bandwidth accounting for streaming over 4G 
Attribute traffic on socket descriptors to UID of videos app

Multi-repository commit, see also changes in frameworks/base/media.

Includes Widevine library version 4.5.0.6153

Change-Id: I5ddf1b7b758edc82d48a788fc30616d90cab4bd0
related-to-bug: 5434244
 2012-03-08 15:08:47 -08:00
The Android Automerger
37ce87816a merge in jb-release history after reset to master 2012-03-06 07:08:52 -08:00
Edwin Wong
8f4420fcea TYPE_ALL_RIGHTS_REMOVED must not be used as an error type. 
related-to-bug: 6060863

Change-Id: I9a3c4724c88dc5a642dfa936843d847a4ae53de3
 2012-03-02 15:06:23 -08:00
The Android Automerger
47aa998760 merge in jb-release history after reset to master 2012-02-29 07:08:37 -08:00
Edwin Wong
a4d2b1b37c Change portal used by test-wvplayer. 
related-to-bug: 6030747

Change-Id: I570d126750438f08bfdb0f29c71a6a9b5976c281
 2012-02-28 13:47:56 -08:00
The Android Automerger
36d4620a9c merge in jb-release history after reset to master 2012-02-13 09:05:25 -08:00
The Android Automerger
885dc27023 merge in jb-release history after reset to master 2012-02-09 07:05:29 -08:00
Edwin Wong
96ccef64bb Fixed native crash observed on L3 devices by Jeff Tinker. 
Change-Id: If78b7e9b5b5f4b87c5b2c55f75a00704e8536ce6
related-to-bug: 5952202
 2012-02-08 17:25:29 -08:00
James Dong
bab8ed4582 Move away from MediaDebug and use ADebug instead 
Change-Id: Id904857259a5de0b77f09716315ceb8f665af4e0
 2012-02-08 15:17:27 -08:00
The Android Automerger
5c13341b43 merge in jb-release history after reset to master 2012-01-30 07:06:57 -08:00
Edwin Wong
beb9b7b603 Add support to query through DrmInfoRequest::TYPE_REGISTRATION_INFO to check if a device is provisioned. 
Includes Widevine lib version: 4.5.0.5781 AES BR_PYTHON2

Change-Id: Id5e673b97e3ec80532e2d7f42aae687adfecc765
related-to-bug: 5152997
 2012-01-27 09:40:36 -08:00
Jeff Tinker
c3949b1967 Changed license headers from AOSP to Google copyright 
Change-Id: I3587e290cf49755e06354118fbf877d189508ce8
related-to-bug: 5833045
 2012-01-24 15:27:50 -08:00
The Android Automerger
9a8f1ac37f merge in ics-release history after reset to master 2012-01-24 07:02:15 -08:00
Jeff Tinker
c634a709f9 am 65d4c7ab: Fix security hole and hang on movie playback 
* commit '65d4c7ab2031833cf82331aa375da0bdec282303':
  Fix security hole and hang on movie playback
 2012-01-23 09:18:02 -08:00
Jeff Tinker
d3c089fe70 am 65d4c7ab: Fix security hole and hang on movie playback 
* commit '65d4c7ab2031833cf82331aa375da0bdec282303':
  Fix security hole and hang on movie playback
 2012-01-20 12:08:59 -08:00
Jeff Tinker
65d4c7ab20 Fix security hole and hang on movie playback 
Security hole is in /data/drm world writable directories
Hang on movie playback was found on ASUS TF201

Sorry, can't make these independent since binary libs aren't
mergeable.

Contains Widevine library Version 4.5.0.5753

Change-Id: I01ddfc5b2390f15d5d187dd6581b0a01743f4a68
related-to-bug: 5834297
related-to-bug: 5874137
 2012-01-20 10:31:40 -08:00
The Android Automerger
65ba93bcd1 merge in ics-release history after reset to master 2012-01-18 07:02:15 -08:00
James Dong
ec3d3d9f47 Remove excessive warning log message from IsWidevineMedia() method 
Change-Id: I0358541c10c9807332579c80a1111074b38a721e
 2012-01-17 10:52:11 -08:00
The Android Automerger
54a31aa871 merge in ics-release history after reset to master 2012-01-17 07:03:51 -08:00
James Dong
9fd21a7798 Implement WV side of the separation of sniffing and decrypt session initialization. 
Further optimization may be done to further speed up a drm content playback session

related-to-bug: 5725548

Change-Id: Ife69deaf5d2d70bba812fe1a48d9268d8e9530f7
 2012-01-12 16:12:39 -08:00
The Android Automerger
1a67b379ac merge in ics-release history after reset to master 2012-01-10 07:03:03 -08:00
The Android Automerger
6a58f84d71 merge in ics-release history after reset to master 2012-01-09 07:04:03 -08:00
Steve Block
7284b7e7f3 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I9b2273ef758c78d927591c1a0a9f988de739742c
 2012-01-08 10:17:01 +00:00
Steve Block
b443024341 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:08:24 -08:00
The Android Automerger
07db2b783b merge in ics-release history after reset to master 2012-01-05 07:02:17 -08:00
Jeff Tinker
ddf87803c7 am f66301bd: Report correct decrypted video length to OMX codec 
* commit 'f66301bddb27f6dc5abb0fa0b4d368d7ff6c6840':
  Report correct decrypted video length to OMX codec
 2012-01-04 21:51:51 -08:00
Jeff Tinker
c9c2ebc9bf am f66301bd: Report correct decrypted video length to OMX codec 
* commit 'f66301bddb27f6dc5abb0fa0b4d368d7ff6c6840':
  Report correct decrypted video length to OMX codec
 2012-01-04 13:21:47 -08:00
Steve Block
8d8df85113 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib8dfa140669788229a5a59d5849907c92393225c
 2012-01-04 20:06:42 +00:00
Steve Block
efe632956d Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I2d28198c2fc4622a090f4d830cbb311fe522749c
 2012-01-03 22:33:09 +00:00
Jeff Tinker
f66301bddb Report correct decrypted video length to OMX codec 
Change-Id: I8f869cfbb0ee74d03d1b0cb14c422c4b78b3692d
related-to-bug: 5772593
 2011-12-16 16:10:32 -08:00
The Android Automerger
7e2f1dd588 merge in ics-release history after reset to master 2011-12-15 07:02:19 -08:00
James Dong
4b10b77fa1 am 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. 
* commit '444dc2a84539f100689642f5756e5e6d6e5cd705':
  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.
 2011-12-14 13:53:32 -08:00
James Dong
3b4e1f62db am 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. 
* commit '444dc2a84539f100689642f5756e5e6d6e5cd705':
  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.
 2011-12-14 13:50:16 -08:00
James Dong
444dc2a845 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.

This reverts commit 95d4dc7776.

related-to-bug: 5739618
 2011-12-14 11:05:53 -08:00
The Android Automerger
3b9e8d70ab merge in ics-release history after reset to master 2011-12-13 07:02:29 -08:00
Jeff Tinker
e6aa26e7cf am c00a26a0: Fix OMX codec error playing Widevine content on Nexus S 
* commit 'c00a26a05f59c352dc457a211284dc2c697ae2fd':
  Fix OMX codec error playing Widevine content on Nexus S
 2011-12-12 15:39:25 -08:00
Jeff Tinker
f9bda12fb3 am c00a26a0: Fix OMX codec error playing Widevine content on Nexus S 
* commit 'c00a26a05f59c352dc457a211284dc2c697ae2fd':
  Fix OMX codec error playing Widevine content on Nexus S
 2011-12-12 11:22:39 -08:00