Fred Gylys-Colwell
32ac45f9bb
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29 am: f7da678770
...
Change-Id: If50288cf22f06b3c828d2d478563f8099a43a066
2020-04-03 17:41:53 +00:00
Fred Gylys-Colwell
afb175b368
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29 am: dd209b595a
...
Change-Id: I2b67084dbe917644a7a6152abf832baa03f2effa
2020-04-03 17:39:26 +00:00
Fred Gylys-Colwell
30aaa6ba10
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: 3c71641040
...
Change-Id: I639e1d711cba7aedd1009ac11416a1840a3adc17
2020-04-03 17:17:10 +00:00
Fred Gylys-Colwell
dd209b595a
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29
...
Change-Id: I54ea0789a803923bf2dab95ed71eda52cdb60d9b
2020-04-03 17:16:19 +00:00
Fred Gylys-Colwell
f7da678770
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29
...
Change-Id: Ib139a700f2bc6b74999abdfb7618ad9d265cae22
2020-04-03 17:16:11 +00:00
Fred Gylys-Colwell
b1d7728b29
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4
...
Change-Id: Ib75c6d6ba0ede24858827da7c611d1888bf5baf3
2020-04-03 16:54:40 +00:00
Fred Gylys-Colwell
3c71641040
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4
...
Change-Id: I021dcc56aa8619325f9c97b632562cc8e387c2a2
2020-04-03 16:54:29 +00:00
Fred Gylys-Colwell
bab44e0ad4
Merge "Adjust time for unit tests" into rvc-dev
2020-04-03 16:30:53 +00:00
Fred Gylys-Colwell
67aaa1c309
Adjust time for unit tests
...
Merge from Widevine repo of http://go/wvgerrit/96843
This CL modifies the system time used by the reference OEMCrypto so
that it recovers from a clock rollback. When the clock rolls back, it
now adjusts the current time and continues forward. This is needed
when running unit tests on some platforms that reset the clock at
the beginning of a test.
Bug: 152649427
Test: unit tests on buildbot. (No production code on Android)
Change-Id: I7edcdc0cd4e5938c9a54e745d3a0e008f9eb13ed
2020-04-03 16:28:38 +00:00
TreeHugger Robot
906363bf57
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 52616ab94b am: ba80e974ea am: 5d1b020aeb
...
Change-Id: I612d807b260d06769e29911f189094b28dd572dc
2020-04-02 00:47:33 +00:00
TreeHugger Robot
5d1b020aeb
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 52616ab94b am: ba80e974ea
...
Change-Id: I3115a9c41e4493f56c6c5f0927f74a4e25f1e570
2020-04-02 00:35:51 +00:00
TreeHugger Robot
84de11f6ec
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 74372b97bd am: 0d3e42d557
...
Change-Id: If8bed7b53e1a1424928f8d343594c70c957caa03
2020-04-02 00:35:26 +00:00
TreeHugger Robot
09121feb52
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942 am: d251cea528 am: b196554f90
...
Change-Id: Ie324f4fc78d93efef42889cffdc98f9dfd34dc27
2020-04-02 00:34:58 +00:00
TreeHugger Robot
0d3e42d557
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 74372b97bd
...
Change-Id: I51145567274971831422fde8d0b7b31becceda1c
2020-04-02 00:09:32 +00:00
TreeHugger Robot
ba80e974ea
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 52616ab94b
...
Change-Id: I68ce3a280d3fd0133c6f58d6be9a21991578c3ed
2020-04-02 00:09:10 +00:00
TreeHugger Robot
b196554f90
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942 am: d251cea528
...
Change-Id: I00bde3e8d7d7eb520c36ef6348be2a9a24c7918c
2020-04-02 00:08:05 +00:00
TreeHugger Robot
52616ab94b
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df
...
Change-Id: I924777b8ab8abe5d08fffa43335bdeb9d9c8643b
2020-04-01 23:49:31 +00:00
TreeHugger Robot
74372b97bd
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df
...
Change-Id: I3df23c70eb4ecf1f118a46e4e5477fe6f946cf8f
2020-04-01 23:48:02 +00:00
TreeHugger Robot
d251cea528
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942
...
Change-Id: I9cfa9df6c3a2d733449ab329c32021d767f4a2f4
2020-04-01 23:40:54 +00:00
TreeHugger Robot
3fdeb011df
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779
...
Change-Id: I24b593df28cc9a0000901c813b6fd1bd72e6d61b
2020-04-01 23:20:39 +00:00
TreeHugger Robot
5775aff942
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779
...
Change-Id: I01fda2def9771a40c1e4c5b2bfcac2b92401f574
2020-04-01 23:19:25 +00:00
TreeHugger Robot
4fe638a779
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev
2020-04-01 22:52:21 +00:00
Robert Shih
07f40d1bed
CryptoSession: Propagate err from GetSystemIdInternal in Open
...
Merge of http://go/wvgerrit/96509
Bug: 151231204
Test: GtsMediaTestCases
Change-Id: Ib29691fcea1c9d5fcfa981caf3e5bdab00cbb0bf
2020-04-01 07:01:24 +00:00
TreeHugger Robot
b4477c75ed
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 4d3ebc6b87 am: 615054059a am: 2b39f18160
...
Change-Id: I24a8f291125c8adca3a13032afa156b10b54a2a7
2020-04-01 06:20:47 +00:00
TreeHugger Robot
2b39f18160
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 4d3ebc6b87 am: 615054059a
...
Change-Id: I723579fe1b5725534485e7b849e29bdc5068a825
2020-04-01 06:15:51 +00:00
TreeHugger Robot
078051f27c
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: f8175bda83 am: 6b53b2f4ba am: 6f5c2b9b56
...
Change-Id: I96da2f284dc829ade6b36f7b863dc03bbdde0984
2020-04-01 06:15:36 +00:00
TreeHugger Robot
a9ada96c6e
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 08eb9a7fae am: 29b6a916c9
...
Change-Id: I912abc7d15b847fc116d15b9ff919db557a4d7c0
2020-04-01 06:15:15 +00:00
TreeHugger Robot
6f5c2b9b56
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: f8175bda83 am: 6b53b2f4ba
...
Change-Id: I2e3c66b88e43d696793ec417b2bf673a090a67ff
2020-04-01 05:57:24 +00:00
TreeHugger Robot
29b6a916c9
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 08eb9a7fae
...
Change-Id: I0a4e38b9ff8b755059fd7feeb85ab39cafe4717d
2020-04-01 05:57:16 +00:00
TreeHugger Robot
615054059a
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8 am: 4d3ebc6b87
...
Change-Id: I5a34bf4824a7eb8b382c9eba314de0d393736c8e
2020-04-01 05:57:06 +00:00
TreeHugger Robot
6b53b2f4ba
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: f8175bda83
...
Change-Id: I6fb21dee970930702e83f11e8e8a6f4da0bea921
2020-04-01 05:44:35 +00:00
TreeHugger Robot
4d3ebc6b87
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8
...
Change-Id: I1ad7226acc3d63a19d7178450499972eeffd7c40
2020-04-01 05:44:29 +00:00
TreeHugger Robot
08eb9a7fae
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d am: 94108cdbe8
...
Change-Id: Ie6186c8d4a98c65b4eab47b329c72eceebd25b2a
2020-04-01 05:44:04 +00:00
TreeHugger Robot
f8175bda83
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d
...
Change-Id: Ib7a0a1c7f1ad11f80482efa0bf87259d5d7d5207
2020-04-01 05:32:06 +00:00
TreeHugger Robot
94108cdbe8
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev am: e59339ed6d
...
Change-Id: Ie427ca27c16376f1202e3a43b58a50f19ecc0d94
2020-04-01 05:32:01 +00:00
TreeHugger Robot
e59339ed6d
Merge "CryptoSession: handle 0-length buffer in DecryptSample" into rvc-dev
2020-04-01 05:12:53 +00:00
Robert Shih
dc9809f7c3
CryptoSession: handle 0-length buffer in DecryptSample
...
In `Combine Decrypt Calls to OEMCrypto`,
OEMCrypto_ERROR_BUFFER_TOO_LARGE is used as the default error code to
signal fallback to legacy decrypt (sending subsamples separately).
The error code would not be updated if no calls to OEMCrypto were
made (e.g. 0-length buffers).
This change resets error code to OEMCrypto_SUCCESS after fall back to
legacy decrypt. Consequently, buffers that do no require OEMCrypto
calls would return OEMCrypto_SUCCESS.
Merge of http://go/wvgerrit/96743
Bug: 150188155
Test: GtsMediaTestCases
Test: DashTest#testWidevineH264AdaptiveWithRendererDisabling
Change-Id: Ib23803c51f16bc809bda5c2720e628e81f1df1dc
2020-04-01 02:47:13 +00:00
John Bruce
67f74b9755
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 630141b5fc am: 158f1f8c48
...
Change-Id: If1b0cccfe41927207e028d23e0829c8f3cc4d0b6
2020-03-30 21:23:36 +00:00
John Bruce
158f1f8c48
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 630141b5fc
...
Change-Id: I0131a1c967fb3c53288a71f6987b93ad5c412c1d
2020-03-30 19:34:59 +00:00
John Bruce
57d9848eee
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 6ae7e5e14a am: 0faf2b48f0 am: f867569b57
...
Change-Id: Id7a58c01c68898c30d484b0750a9d4f7e6e6e343
2020-03-30 19:26:30 +00:00
John Bruce
7248a4a0cb
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: 5f09de89ae am: bbd4f33386 am: 34a282635a
...
Change-Id: Iac1b6ddc1b0a826e6aaef46c6379ab9b77c3c486
2020-03-30 19:24:05 +00:00
John Bruce
f867569b57
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 6ae7e5e14a am: 0faf2b48f0
...
Change-Id: I17977a0755c137f8afdd6bcff8306ad4b1f49067
2020-03-30 19:09:36 +00:00
John Bruce
630141b5fc
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b
...
Change-Id: Id972921cfb3c458c8611631e3f5375b7a0066e0a
2020-03-30 19:09:24 +00:00
John Bruce
34a282635a
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: 5f09de89ae am: bbd4f33386
...
Change-Id: I68e44ebe51d3a5afd73303f2e225a0b813f01f50
2020-03-30 18:57:28 +00:00
John Bruce
0faf2b48f0
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b am: 6ae7e5e14a
...
Change-Id: Iab845ff16e0b2dd02cc3ba9904a35e8907e55cfa
2020-03-30 18:56:26 +00:00
John Bruce
bbd4f33386
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: 5f09de89ae
...
Change-Id: I73ca6457a6b8aa132e47a5479751f3616f92c3b0
2020-03-30 18:15:28 +00:00
John Bruce
6ae7e5e14a
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d am: d57c09b29b
...
Change-Id: I097e489a6858ca3ed9a62f8cd3b2a6b05f8ec54d
2020-03-30 18:14:31 +00:00
John Bruce
d57c09b29b
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d
...
Change-Id: I4e1f3e8ff3e11e7d06defad929bf08ef828b23eb
2020-03-30 18:00:26 +00:00
John Bruce
5f09de89ae
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev am: c113df815d
...
Change-Id: Ifcfe2508123bca879c457082090133751bceae6a
2020-03-30 17:59:52 +00:00
John Bruce
c113df815d
Merge "Update OEMCrypto Version Compatibility Document" into rvc-dev
2020-03-30 17:46:33 +00:00
