Commit Graph

3496 Commits

Author SHA1 Message Date
Automerger Merge Worker
17ff88c7d4 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a am: 511335d53b am: e36b9c3432
Change-Id: I93d801adef49f51808842c4b51ec124d5012a0f4
2020-03-05 22:23:15 +00:00
Automerger Merge Worker
e36b9c3432 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a am: 511335d53b
Change-Id: I709904385287d4b7199153b54245aca14291ad2b
2020-03-05 22:07:36 +00:00
Automerger Merge Worker
511335d53b Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a
Change-Id: Iccb53a9a23c6c4d43cda60e6c587f6e885b3d165
2020-03-05 21:53:52 +00:00
Automerger Merge Worker
ae5ff19c3a Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59
Change-Id: Idb759df35395da86809c221da316de3c4b2ced24
2020-03-05 21:30:54 +00:00
Fred Gylys-Colwell
174c57bb59 Merge "Update ODK Library and add license release unit test" into rvc-dev 2020-03-05 21:16:55 +00:00
Fred Gylys-Colwell
c5b7a01ab5 Update ODK Library and add license release unit test
Merge from Widevine repo of two CLs.

Merge from Widevine repo of http://go/wvgerrit/94743

A license release should not have a core message. This CL adjusts the
existing unit tests to verify this. There is also a new unit test called
SecureStop that explicitly tests sending a secure stop in a new
session without first loading the license.

Merge from Widevine repo of http://go/wvgerrit/94865

This CL has the following changes copied from google3:
http://cr/298871728 Remove odk_static_assert for Message size temporarily
http://cr/298755935 Fix a compiling error during macro expansion
http://cr/298481745 Add missing header for android
http://cr/298448142 Fix odk_test gyp file
http://cr/298419641 Remove header from Android.bp
http://cr/298402053 Separate sizeOf(args) bytes in fuzz tests
http://cr/297730316 No core messages for license release
http://cr/297714346 Add copybara_test and piper_sot_to_gerrit
http://cr/297636713 Adding some comments around boolean conversion code
http://cr/297420679 Autofuzzer when ran with address sanitizer ...
http://cr/296513584 Minor fix with fuzzing odk clock values
http://cr/296322024 Fixing errors in code with how request ...
http://cr/296313159 Fuzzing ODK clock values by setting aside ...
http://cr/295763207 Add more odk tests and move helper functions to test helper
http://cr/294524098 Adding a Build Rule for ODK_KDO_Fuzzer and updating
http://cr/294492213 Address a few review comments of ODK
http://cr/293674368 odk_fuzz: add TODOs & comments
http://cr/293492806 Fix spelling

Bug: 150243585
Bug: 150020278
Bug: 150095506
Bug: 147297226
Bug: 148290294
Bug: 148907684
Bug: 150608451
Test: unit tests
Change-Id: I25fd406f29f4eba40f5cb27e9a1317dce4ffc2f5
2020-03-05 19:06:31 +00:00
Automerger Merge Worker
8ea0a84528 Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 030aabb66f am: 2b37161991 am: c848077bba
Change-Id: Ie771a4702a4b0ec425f68cf6eeb4b171bdcba14d
2020-03-05 00:50:18 +00:00
Automerger Merge Worker
d4157db16d Merge "Correct log messages" into rvc-dev am: d0d3216eda am: b093ce8733 am: 69f1ab03c7 am: d23eaff1ab
Change-Id: Ifd41e96ed4e725617affd1580a4a9cb5dac65a09
2020-03-05 00:50:11 +00:00
Automerger Merge Worker
646ae17d0c Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 5e9ab5aa83 am: 3eeab6d48d
Change-Id: I5d1f46fc4142df0aa80baba4981682763656bc96
2020-03-05 00:49:45 +00:00
Automerger Merge Worker
c848077bba Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 030aabb66f am: 2b37161991
Change-Id: Ic0e1da4108e10c2269480e38734115874038c1ef
2020-03-05 00:43:30 +00:00
Automerger Merge Worker
d23eaff1ab Merge "Correct log messages" into rvc-dev am: d0d3216eda am: b093ce8733 am: 69f1ab03c7
Change-Id: I84e231b9a79a5a6dc8a8753bca41429a7dae4484
2020-03-05 00:37:20 +00:00
Automerger Merge Worker
3eeab6d48d Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 5e9ab5aa83
Change-Id: I779aab44b25c88068eaa62d197c44df4a9157792
2020-03-05 00:36:54 +00:00
Automerger Merge Worker
2b37161991 Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 030aabb66f
Change-Id: Id3cc131f9a1ef010f2b455f88d0f858930ce88ef
2020-03-05 00:36:17 +00:00
Automerger Merge Worker
69f1ab03c7 Merge "Correct log messages" into rvc-dev am: d0d3216eda am: b093ce8733
Change-Id: Id0daa39e50810e2551d36737551c1187b4f3edbb
2020-03-05 00:27:12 +00:00
Automerger Merge Worker
030aabb66f Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246
Change-Id: Icb5d38b207a1a5048ce5b717c49842896f0343fa
2020-03-05 00:27:07 +00:00
Automerger Merge Worker
5e9ab5aa83 Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246
Change-Id: I8ca840929b60296832a6da443fb79dc91e332778
2020-03-05 00:26:55 +00:00
Automerger Merge Worker
b093ce8733 Merge "Correct log messages" into rvc-dev am: d0d3216eda
Change-Id: I7fb8dcd64b45f872e3cf840ef59aaddeabb63163
2020-03-05 00:11:02 +00:00
Automerger Merge Worker
ec2d331246 Merge "Correct log messages" into rvc-dev am: d0d3216eda
Change-Id: Ib9d57ae301d678b6d2c1ec879aa6b4374ddc9e40
2020-03-05 00:11:01 +00:00
Rahul Frias
d0d3216eda Merge "Correct log messages" into rvc-dev 2020-03-05 00:01:37 +00:00
Automerger Merge Worker
f69707c556 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 6e14debce3 am: 53babd374a am: b7f75f3959
Change-Id: I6e258f697dbbd1763a47fa58016442c48e95d9ef
2020-03-04 20:37:24 +00:00
Automerger Merge Worker
d2a8605fe1 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 6e18484a49 am: a03a713af2 am: 9e25ff264e
Change-Id: I5dbd33dcde058addb900abe0612775121a3d9bfa
2020-03-04 20:36:40 +00:00
Automerger Merge Worker
d3a42b6e85 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 1aa1ee7170 am: 447cc2b6f7
Change-Id: I719c77104c8519d2e1c33c9ae5e6c801bf2bc37f
2020-03-04 20:35:43 +00:00
Automerger Merge Worker
b7f75f3959 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 6e14debce3 am: 53babd374a
Change-Id: I520ad81d23edf93ecc580c509ede3f0eedcb7311
2020-03-04 20:34:31 +00:00
Automerger Merge Worker
9e25ff264e hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 6e18484a49 am: a03a713af2
Change-Id: Ifdca8bb5858857a7cee8c492eaf3950d20cfd666
2020-03-04 20:19:31 +00:00
Automerger Merge Worker
53babd374a hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 6e14debce3
Change-Id: Icd6995d494e2a8338b572e687104e1611265f0d1
2020-03-04 20:19:29 +00:00
Automerger Merge Worker
447cc2b6f7 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 1aa1ee7170
Change-Id: I5edb4ac118ed53ec33c8388629bb158df2171d91
2020-03-04 20:19:08 +00:00
Automerger Merge Worker
a03a713af2 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 6e18484a49
Change-Id: I0162b1f8a62427ace6a52ccbef267624e56fea14
2020-03-04 20:03:22 +00:00
Automerger Merge Worker
6e14debce3 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb
Change-Id: Id1e03bc728fb4f119d101e32c3e372136bf66a92
2020-03-04 20:03:17 +00:00
Automerger Merge Worker
1aa1ee7170 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb
Change-Id: I4136c508b2c4c9351ab5cf9f3ea9ae9ef4955926
2020-03-04 20:03:10 +00:00
Automerger Merge Worker
6e18484a49 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee
Change-Id: I0ea9b79244b92ab9afd6a963c2753e47c406529a
2020-03-04 19:48:20 +00:00
Automerger Merge Worker
8f127f41cb hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee
Change-Id: I30c8e0fd77385a4d14ef0c8483b2654792dcdbc1
2020-03-04 19:48:01 +00:00
Automerger Merge Worker
23c1be8cee hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e
Change-Id: I7dbc26be06ae0fdfa0013dd65a57c169b21f4bdc
2020-03-04 19:33:38 +00:00
Robert Shih
9a530b7f1e hidl WVDrmPlugin openSession: set securityLevel correctly
Merge of http://go/wvgerrit/94827

Bug: 149035295
Bug: 150103154
Bug: 150407639
Test: VtsHalDrmV1_2TargetTest
Change-Id: I3687b2305eb413112f7fbd0d5127d2168cdf376d
2020-03-04 18:44:44 +00:00
Automerger Merge Worker
b1e91eb78a [automerger skipped] Merge "Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9" into rvc-d1-dev-plus-aosp am: ea2124a286 -s ours am: 120ff74e3d -s ours
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: Ia190afdb3140f4da1cc22d47c791acde58ae594b
2020-03-02 19:32:04 +00:00
Automerger Merge Worker
51c3647384 [automerger skipped] Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9 am: b7408fbe9e -s ours am: 074c2b7f9c -s ours
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: Ie2f966d18d1e64a8ec210b6c4516622c830d6a85
2020-03-02 19:30:54 +00:00
Automerger Merge Worker
2320fc5f3d [automerger skipped] Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: bbf7f28831 am: 09d4f2b535 am: b5b23ba16c -s ours
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 d9c703ef9e is in history

Change-Id: Ib20928c1ff9ccf3475a362df9bdc8d5b284f0901
2020-03-02 19:29:26 +00:00
Automerger Merge Worker
120ff74e3d [automerger skipped] Merge "Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9" into rvc-d1-dev-plus-aosp am: ea2124a286 -s ours
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: If96bace3b5af83e8fbe534682e29cb352da98b8c
2020-03-02 19:12:52 +00:00
Automerger Merge Worker
074c2b7f9c [automerger skipped] Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9 am: b7408fbe9e -s ours
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: I21c1e3c9e82d4de4cdeb599ba597bbad759218dd
2020-03-02 19:12:23 +00:00
Automerger Merge Worker
b5b23ba16c Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: bbf7f28831 am: 09d4f2b535
Change-Id: I0ccd660b7b452443bc6afb67de53361f57866bc7
2020-03-02 19:11:38 +00:00
Automerger Merge Worker
ea2124a286 Merge "Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9" into rvc-d1-dev-plus-aosp 2020-03-02 18:54:55 +00:00
Automerger Merge Worker
42cb23e6e9 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9
Change-Id: I634b830d2673ec385146cca388577b54ce60f68b
2020-03-02 18:54:51 +00:00
Automerger Merge Worker
b7408fbe9e Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9
Change-Id: If8e9bc95640e4bfa7ac9c4c03fd29f670d4c0639
2020-03-02 18:54:48 +00:00
Automerger Merge Worker
09d4f2b535 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: bbf7f28831
Change-Id: Ie8b36f165c74fc8fbebd636a3efc8e81bb3393e1
2020-03-02 18:54:48 +00:00
Automerger Merge Worker
bbf7f28831 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c
Change-Id: Ia54a736025a3fe6eab32ab616947785f98e68ac3
2020-03-02 18:44:17 +00:00
Automerger Merge Worker
cfb91676e9 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c
Change-Id: I8fcebbe44c80c38448915cff2ef506ccedc32865
2020-03-02 18:43:58 +00:00
Alex Dale
d3f10ece7c Merge "CDM handles mixed output warnings." into rvc-dev 2020-03-02 18:35:13 +00:00
Automerger Merge Worker
659e02f338 Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b am: 92422fe4f1 am: d25dc0c09e
Change-Id: Iab7da20ff71bab79c31b23d27be33d3082c034ff
2020-02-29 02:36:57 +00:00
Automerger Merge Worker
65ba378dbc Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: b604a114fa am: c80a6473d9 am: 7d128f56a4
Change-Id: I362f2ed3a1cbd64fe4a8e44cf333dd44bc0128cd
2020-02-29 02:36:44 +00:00
Automerger Merge Worker
4bcd5c169e Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b am: a035e72daf am: 9875b5a130
Change-Id: I16f2224321a237394f9aff0b235bc8d6d1128a4a
2020-02-29 02:36:29 +00:00
Automerger Merge Worker
d25dc0c09e Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b am: 92422fe4f1
Change-Id: I02b0c1e57e34f7d6b4e4e7cbdfa0974cac3de65e
2020-02-29 02:24:53 +00:00