widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,227 Commits 2 Branches 0 Tags
00caf5f7c2a741d5800db124152a82794ff7aea5
Commit Graph

4227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Frias
ad06c10609 Accept a security level to be specified during provisioning am: e27bc4ba6a am: 8429ab587a am: 8cc100c11a 
Change-Id: I1b45aebfc57799f89a789a2ac839bf1c8f95a9c6
 2020-04-30 00:53:35 +00:00
Rahul Frias
4b704dea65 Accept a security level to be specified during provisioning am: e27bc4ba6a am: 8429ab587a am: d3920095ba 
Change-Id: I88e37373b2f07274589fa1674c1fc67e90c7c01a
 2020-04-30 00:53:29 +00:00
Alex Dale
2a16d70a06 Suppress error for removing lingering offline licenses. 
[ Merge of http://go/wvgerrit/97963 ]

There are situations where an offline license file will remain on the
system after it's usage entry has been deleted.  This would result in
its key set ID being reported as present by the CDM, but any
operations acting upon it will result in an error.

The app should be able to remove the license without error, so long
as the license file exists and no other OEMCrypto operations fail.

This change introduces a new error code LICENSE_USAGE_ENTRY_MISSING,
which indicates that a license's usage entry cannot be found.

A new integration test checks that the CDM can handle the calls to
removeOfflineLicense().

Bug: 137034719
Test: Android unit and integration tests
Change-Id: Ibdbe963b7f7e3ac97b446300d8e3896cdee7abc5
 2020-04-29 17:48:26 -07:00
Rahul Frias
8cc100c11a Accept a security level to be specified during provisioning am: e27bc4ba6a am: 8429ab587a 
Change-Id: I713649c76556b91afcd6ebcc0042c415ff2eee4b
 2020-04-30 00:42:47 +00:00
Rahul Frias
874b639de1 [automerger skipped] Accept a security level to be specified during provisioning am: e27bc4ba6a am: 2ffb86ffca -s ours 
am skip reason: Change-Id I8d9234eec2b23a9c913e77a709943b431e25e43e with SHA-1 e27bc4ba6a is in history

Change-Id: I889758a62f9c834e36aabf91a9a8bbc3ec28cf3b
 2020-04-30 00:42:17 +00:00
Rahul Frias
d3920095ba Accept a security level to be specified during provisioning am: e27bc4ba6a am: 8429ab587a 
Change-Id: I27505670c228a8cdfa4930814b205270b612eafb
 2020-04-30 00:41:36 +00:00
Rahul Frias
2ffb86ffca Accept a security level to be specified during provisioning am: e27bc4ba6a 
Change-Id: I40d648eadb71cc4677fb9b38f8e766ee4f552c19
 2020-04-30 00:27:14 +00:00
Rahul Frias
8429ab587a Accept a security level to be specified during provisioning am: e27bc4ba6a 
Change-Id: I20b0adbb6c27507b7d63a6cd0084b4230d5ed6e0
 2020-04-30 00:27:03 +00:00
Rahul Frias
e27bc4ba6a Accept a security level to be specified during provisioning 
[ Merge of http://go/wvgerrit/97267 ]

In earlier releases, provisioning would occur based on a cached
security level. If an open session call returned a NotProvisionedException
the security level would be cached for use with any future provisioning
call.

An app would have to set the security level, then call openSession,
have it fail and then request provisioning. This fits the normal flow of
most apps. Still on occasion, an app might change requested security level
after an openSession call failed. Using the cached security level
would result in unexpected behavior.

This change allows provisioning to occur at the last security level that
was set.

Bug: 129356527
Test: wv unit/integration tests, GTS tests (GtsMediaTestCases)
Merged-In: I8d9234eec2b23a9c913e77a709943b431e25e43e
Change-Id: I8d9234eec2b23a9c913e77a709943b431e25e43e
 2020-04-28 11:58:59 -07:00
TreeHugger Robot
9227799669 Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d am: 8118bb3bc4 am: 85dd06e0ef am: ece8039b72 
Change-Id: I42be117ab26d30b0832df3393b02eafea5dccc73
 2020-04-28 18:35:19 +00:00
TreeHugger Robot
7550d7e62e Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 am: 04d320094e am: d0d94be3ff am: 448b54ad07 
Change-Id: I50245c9e79baa6606974e5796f9c35dc871ce814
 2020-04-28 18:35:01 +00:00
TreeHugger Robot
3c01d26073 Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: c14031eb7b am: aec7696984 am: 1b76b4f8cf 
Change-Id: I6aa64113801464c0738585de82791845ef394d90
 2020-04-28 18:34:40 +00:00
TreeHugger Robot
e14c22dfa7 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: 48a1c257fd am: 248ec379d2 am: 42661094b2 
Change-Id: I262bf88b1db0ff2888eff8f9eb8ba1727d85f066
 2020-04-28 18:34:24 +00:00
TreeHugger Robot
17d11f801c Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d am: 925db173aa am: aadd73c75a 
Change-Id: I3a65fc11fe40febe8d007ee5980a5bdc5018df9b
 2020-04-28 18:34:18 +00:00
TreeHugger Robot
0a32a51738 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 am: 8b05bc3ed5 am: 0aba05ea26 
Change-Id: Id65a33e14923f13ff95b700fe7f7d2b7515da084
 2020-04-28 18:33:59 +00:00
TreeHugger Robot
ece8039b72 Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d am: 8118bb3bc4 am: 85dd06e0ef 
Change-Id: Id508b80b35b39112a719e2614f5e3adb199bb9f8
 2020-04-28 18:24:14 +00:00
TreeHugger Robot
448b54ad07 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 am: 04d320094e am: d0d94be3ff 
Change-Id: Id7637ee17ea55b863d993904072b231a9df4b5af
 2020-04-28 18:23:31 +00:00
TreeHugger Robot
1b76b4f8cf Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: c14031eb7b am: aec7696984 
Change-Id: I67e994ad3b3a49f1b0ae802cf2675141548c50a6
 2020-04-28 18:19:02 +00:00
TreeHugger Robot
42661094b2 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: 48a1c257fd am: 248ec379d2 
Change-Id: If76150ee449c9841d33238f025ebc44c5b9804ea
 2020-04-28 18:18:54 +00:00
TreeHugger Robot
aadd73c75a Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d am: 925db173aa 
Change-Id: I9cf18fb0d655ad3db49af1ea861a83706f3fbbf7
 2020-04-28 18:18:49 +00:00
TreeHugger Robot
0aba05ea26 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 am: 8b05bc3ed5 
Change-Id: I3a20478294ae1aca96bcf114e55642e4281175cb
 2020-04-28 18:18:15 +00:00
TreeHugger Robot
85dd06e0ef Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d am: 8118bb3bc4 
Change-Id: I08c6c360051222f3a5ce1e88bbb7aaf1fdda2aa3
 2020-04-28 18:12:11 +00:00
TreeHugger Robot
d0d94be3ff Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 am: 04d320094e 
Change-Id: Ia71fc1499168da08fa7f9c2dc8e7ee29f02efc44
 2020-04-28 18:11:52 +00:00
TreeHugger Robot
aec7696984 Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: c14031eb7b 
Change-Id: I392d826aa2e377612405dcd61261b9d9096520c0
 2020-04-28 17:58:48 +00:00
TreeHugger Robot
248ec379d2 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: 48a1c257fd 
Change-Id: I993c4401359021539fcd668e978fb3f68d93d340
 2020-04-28 17:58:28 +00:00
TreeHugger Robot
8118bb3bc4 Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d 
Change-Id: I552f241a05393459f83a5ad53373221483649d00
 2020-04-28 17:58:03 +00:00
TreeHugger Robot
925db173aa Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d 
Change-Id: I9097d87eae51f821201e2cc6334c79b2f4494110
 2020-04-28 17:57:59 +00:00
TreeHugger Robot
8b05bc3ed5 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 
Change-Id: I719260bb570ec546cf31c44146f10997f1755ad3
 2020-04-28 17:57:53 +00:00
TreeHugger Robot
04d320094e Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 
Change-Id: I0cf5b550600d0d0b487bfe9a20ad8e035778c191
 2020-04-28 17:57:52 +00:00
TreeHugger Robot
c14031eb7b Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 
Change-Id: I9ee2b3a47a3a61e0596195de39f9e47a4128ec33
 2020-04-28 17:42:16 +00:00
TreeHugger Robot
6fd344812d Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 
Change-Id: I59fa7ba554c560f0c8e68f69747a4eb98f297e51
 2020-04-28 17:42:14 +00:00
TreeHugger Robot
48a1c257fd Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f 
Change-Id: I5d365b629a6c13c36b60d90680c012d81f360baf
 2020-04-28 17:42:06 +00:00
TreeHugger Robot
ed4daa7583 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f 
Change-Id: I6d367165623fd96fa21fee3e274b9c9b99b0aba3
 2020-04-28 17:42:03 +00:00
TreeHugger Robot
6bd68c9660 Merge "Verify error code when usage entry in use" into rvc-dev 2020-04-28 17:25:22 +00:00
TreeHugger Robot
9448696b9f Merge "Fix buffer size on generic decrypt tests" into rvc-dev 2020-04-28 17:23:37 +00:00
Rahul Frias
3c8acc3d56 Accept a security level to be specified during provisioning 
[ Merge of http://go/wvgerrit/98694 and http://go/ag/11052323 ]

In earlier releases, provisioning would occur based on a cached
security level. If an open session call returned a NotProvisionedException
the security level would be cached for use with any future provisioning
call.

An app would have to set the security level, then call openSession,
have it fail and then request provisioning. This fits the normal flow of
most apps. Still on occasion, an app might change requested security level
after an openSession call failed. Using the cached security level
would result in unexpected behavior.

This change allows provisioning to occur at the last security level that
was set.

Bug: 129356527
Test: wv unit/integration tests, GTS tests (GtsMediaTestCases)
Change-Id: I8d9234eec2b23a9c913e77a709943b431e25e43e
 2020-04-27 23:20:40 -07:00
Bharath Chandra Elluru
d0b3316d96 Merge Android odk fuzz changes(Adding corpus) from http://go/wvgerrit/98692 
Google3 CLs:
http://cl/308666040

Bug: b/154264716
Test: Locally ran and built odk fuzz binaries and tested
fuzzer binaries on pixel device
Change-Id: Icdb81291e101a0abdb75f84008f701c06e7384d6

Change-Id: Iad573209b47bd450c843a7cab5570a76c012fce9
 2020-04-27 14:00:17 -07:00
Rahul Frias
8d836e8000 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: e8e0dcd887 am: fbc9019888 am: 4884e79a42 
Change-Id: Iacb9f23ced8ca4e66e0e67cc9ac91d71d77a8a61
 2020-04-25 00:08:30 +00:00
Rahul Frias
b40fc3ec40 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: 70e71421eb am: dec90462b6 
Change-Id: Ic79f1e94fb140bd71ff89bec7331a87e8bd127c9
 2020-04-25 00:07:56 +00:00
Rahul Frias
be2e4e280b Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 086aa7b283 am: 37606c6956 am: cf8f897be3 
Change-Id: I056d3400ab1050dd215573e52ea98e75b6a542be
 2020-04-25 00:05:33 +00:00
Rahul Frias
4884e79a42 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: e8e0dcd887 am: fbc9019888 
Change-Id: I4338722a1555d795d1f29dfdcca00e383f8629d7
 2020-04-24 23:58:49 +00:00
Rahul Frias
dec90462b6 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: 70e71421eb 
Change-Id: Id83de835a3d0a6dab1fed223080f0ad63149234b
 2020-04-24 23:51:05 +00:00
Rahul Frias
cf8f897be3 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 086aa7b283 am: 37606c6956 
Change-Id: I78262af3141d303e6923cfa7708bc549b5e5210d
 2020-04-24 23:49:55 +00:00
Rahul Frias
fbc9019888 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: e8e0dcd887 
Change-Id: I36103187fc1c7a8501a971141b44ba4c3994cda8
 2020-04-24 23:49:20 +00:00
Rahul Frias
70e71421eb Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 
Change-Id: Iec573e53829047daf055003815841c2cc30641c2
 2020-04-24 23:27:56 +00:00
Rahul Frias
e8e0dcd887 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 
Change-Id: I98328c3518339defb48053038aa4c3d82e983e07
 2020-04-24 23:27:30 +00:00
Rahul Frias
37606c6956 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 086aa7b283 
Change-Id: Icb635a36a2b60b6a9410fc786c57ba3020760ac7
 2020-04-24 23:27:26 +00:00
Rahul Frias
3601ac7387 Correct OpenSessions_1_1 test failure am: 3df8bc5133 
Change-Id: I3a11cc8034711d6e1219d3b248fdcf73d7f155e8
 2020-04-24 23:11:45 +00:00
Rahul Frias
086aa7b283 Correct OpenSessions_1_1 test failure am: 3df8bc5133 
Change-Id: I4c1eb3590a956967e85cb1d63969e002a026e8a0
 2020-04-24 23:11:21 +00:00
Fred Gylys-Colwell
a3a61a68c4 Verify error code when usage entry in use 
Merge from Widevine repo of http://go/wvgerrit/98265

Previously, if we tried to shrink the usage table over an entry in
use, we expected an error. Now, we expect the specific error,
OEMCrypto_ERROR_ENTRY_IN_USE.

Test: unit tests on taimen
Bug: 124776024
Change-Id: I2b4b872943bf65401c0a6b5dc1237d77341b1f5b
 2020-04-24 14:13:15 -07:00