Rahul Frias
4040951907
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: d39e5f3ad3 am: 96a3893440 am: ee902bc63f
...
Change-Id: I4f77136607465c1af9ff70d489bf76e4d89dea4e
2020-04-30 21:47:44 +00:00
Rahul Frias
268155f42b
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: da19e563f5 am: aa6c60fbbf am: faedb21020
...
Change-Id: I0be43a42e9e17d5b39f0ca4eea20ef34a8e31a64
2020-04-30 21:47:08 +00:00
Rahul Frias
4915580223
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: da19e563f5 am: c600c70f8c
...
Change-Id: I74036eb6d5547a8702a6e4c3a083078677e798b4
2020-04-30 21:34:56 +00:00
Rahul Frias
faedb21020
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: da19e563f5 am: aa6c60fbbf
...
Change-Id: I7aaaf63f99cc0683578bc3832572b9c469e67f7a
2020-04-30 21:33:56 +00:00
Rahul Frias
ee902bc63f
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: d39e5f3ad3 am: 96a3893440
...
Change-Id: I6f510d9b107e92f6a5705c7218ba9a97a4235b04
2020-04-30 21:33:27 +00:00
Rahul Frias
c600c70f8c
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: da19e563f5
...
Change-Id: I97073ad5e2f8850ebe7757744ace8b49cfb124a7
2020-04-30 21:13:11 +00:00
Rahul Frias
96a3893440
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: d39e5f3ad3
...
Change-Id: I7359b0ed52308d96216b3c55b2fd2fc5efd5a2e9
2020-04-30 21:12:45 +00:00
Rahul Frias
aa6c60fbbf
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4 am: da19e563f5
...
Change-Id: Ib59472b51397e0838ce6b412f324ab630a7b41f5
2020-04-30 21:12:36 +00:00
Rahul Frias
da19e563f5
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4
...
Change-Id: I1a767568408f306b5ff8b2070f362556ba331ef6
2020-04-30 20:55:12 +00:00
Rahul Frias
d39e5f3ad3
Merge "Do not log nonces" into rvc-dev am: d627fdfdd4
...
Change-Id: I3866ed9ac5df8873609a95303a716664fc293490
2020-04-30 20:54:36 +00:00
Rahul Frias
d627fdfdd4
Merge "Do not log nonces" into rvc-dev
2020-04-30 20:40:42 +00:00
Rahul Frias
6ea6723462
Do not log nonces
...
[ Merge of http://go/wvgerrit/99063 ]
Bug: 155329753
Test: wv unit/integration tests
Change-Id: I642b19f817ce69cb0838512cb8922a2e9c51cef2
2020-04-30 00:34:44 -07:00
Rahul Frias
d624485a49
[automerger skipped] Accept a security level to be specified during provisioning am: e27bc4ba6a am: 8429ab587a am: 8cc100c11a am: ad06c10609 -s ours am: b4763de681 -s ours
...
am skip reason: Change-Id I8d9234eec2b23a9c913e77a709943b431e25e43e with SHA-1 e27bc4ba6a
2020-04-30 01:12:20 +00:00
Rahul Frias
a6cf402791
[automerger skipped] Accept a security level to be specified during provisioning am: e27bc4ba6a am: 2ffb86ffca -s ours am: 874b639de1 -s ours am: d0c8c84f88 -s ours
...
am skip reason: Change-Id I8d9234eec2b23a9c913e77a709943b431e25e43e with SHA-1 e27bc4ba6a
2020-04-30 01:12:05 +00:00
Rahul Frias
bf2c744b62
[automerger skipped] Accept a security level to be specified during provisioning am: e27bc4ba6a am: 8429ab587a am: d3920095ba am: 4b704dea65 -s ours
...
am skip reason: Change-Id I8d9234eec2b23a9c913e77a709943b431e25e43e with SHA-1 3c8acc3d56
2020-04-30 01:11:08 +00:00
Rahul Frias
b4763de681
[automerger skipped] Accept a security level to be specified during provisioning am: e27bc4ba6a am: 8429ab587a am: 8cc100c11a am: ad06c10609 -s ours
...
am skip reason: Change-Id I8d9234eec2b23a9c913e77a709943b431e25e43e with SHA-1 e27bc4ba6a
2020-04-30 01:07:12 +00:00
Rahul Frias
d0c8c84f88
[automerger skipped] Accept a security level to be specified during provisioning am: e27bc4ba6a am: 2ffb86ffca -s ours am: 874b639de1 -s ours
...
am skip reason: Change-Id I8d9234eec2b23a9c913e77a709943b431e25e43e with SHA-1 e27bc4ba6a
2020-04-30 00:54:12 +00:00
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
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
