Commit Graph

7321 Commits

Author SHA1 Message Date
Fred Gylys-Colwell
2de79a7ede Fix logging error type am: ab8c06906a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I315e84089536f0af41fcea33dee8ece4d2a630e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 21:46:21 +00:00
Fred Gylys-Colwell
ab8c06906a Fix logging error type
Merge from Widevine repo of http://go/wvgerrit/166942

The error type is no longer an enumeration.

Bug: 271146682

Change-Id: I64f60fde94d1e8a586128a59f1455041622444b6
2023-03-23 16:23:43 +00:00
Alex Dale
333150ca8b Avoid null dereference with empty BCC strings. am: ce25b9d44c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22162393

Change-Id: I1afa1444f8127ce1567bf61639bf3602dd6270ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:22:34 +00:00
Alex Dale
ce25b9d44c Avoid null dereference with empty BCC strings.
[ Merge of http://go/wvgerrit/168482 ]

The function OEMCrypto_GetBootCertificateChain() does not always
provide an additional signature depending on the device.  However, the
CDM would still attempt to dereference the first character in the
additional signature buffer when empty.  This CL changes how the data
pointer to an output string is acquired.  Empty string will instead
pass in a null pointer.

Bug: 272643393
Test: run_prov40_tests
Test: atest GtsMediaTestCases
Change-Id: I10b0a3c7df4fc73272aa701bb01c60672645d4fc
(cherry picked from commit a878e7b98d)
2023-03-20 20:29:58 +00:00
TreeHugger Robot
00bac2ca3a Merge "Add Widevine lazy apex" into udc-dev am: 4e8c713f8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105405

Change-Id: I46198f8179c58d460a46d635bc7cf62ee7f59998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 04:55:44 +00:00
TreeHugger Robot
4e8c713f8b Merge "Add Widevine lazy apex" into udc-dev 2023-03-18 04:02:05 +00:00
Cong Lin
a3f6cc9206 Merge "Update Android L3 after entitled key session fix" into udc-dev am: 412e1bfa13
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22101165

Change-Id: Ie0518f14ed21865a5be2273d85062f4742a5c977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 19:02:21 +00:00
Cong Lin
412e1bfa13 Merge "Update Android L3 after entitled key session fix" into udc-dev 2023-03-16 18:18:09 +00:00
Alex Dale
ae70e78471 Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev am: 7c213563ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21921282

Change-Id: I37df08b5f2a1480baad403c034e5b1b5651dcc9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 22:19:49 +00:00
Alex Dale
7c213563ca Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev 2023-03-15 21:34:37 +00:00
Kyle Zhang
2be47ada77 Add Widevine lazy apex
Bug: 244498309
Test: m com.google.android.widevine.lazy
Change-Id: I226ae922e9ab7817353d3e94d509b9579c6551e1
2023-03-15 21:02:14 +00:00
Cong Lin
3dd24639b3 Update Android L3 after entitled key session fix
This is a merge of
https://widevine-internal-review.googlesource.com/c/cdm/+/168143

Original commit message:
Level3_RemoveEntitledKeySession(key_session) can be called when the
entitled key_session is already released by its entitlement session.
Do not return an error if the key_session to be removed is no longer
valid.

Test: run_dynamic_level3, oemcrypto unit tests on Pixel
Test: GTS media tests
Bug: 264688931
Change-Id: If0e0d0db2137c29e1dab4df321cf11ebcad2451f
2023-03-15 09:52:05 -07:00
Pete Bentley
5e72605159 Include hmac.h in test_base.cpp. am: 4247f72e79 am: 965a7f308d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21985924

Change-Id: Iadfc39b84f45215d889533904c13912e24dc9698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 19:07:48 +00:00
Pete Bentley
965a7f308d Include hmac.h in test_base.cpp. am: 4247f72e79
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21985924

Change-Id: I83c97a129c52454782e9d1641ec3fec5c36fb568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 18:31:19 +00:00
Pete Bentley
4247f72e79 Include hmac.h in test_base.cpp.
Cherry-pick note: Compile fix only, needed for latest AOSP BoringSSL in tm-qpr-dev-plus-aosp and downstream branches, e.g. udc-*-dev.

Original change description:
Include what you use - this is no longer pulled in
by the other headers used in this file.

Bug: 272749540
Test: m
Change-Id: I0d4b480e47f84f367d1a9547b89811c52073a2fc
Merged-In: I0d4b480e47f84f367d1a9547b89811c52073a2fc
(cherry picked from commit c785e91ec3)
2023-03-13 10:44:08 +00:00
TreeHugger Robot
8928214a06 Merge "Adding ApexInfo utility" into udc-dev am: cb0d5e24be
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21702626

Change-Id: I7dd39c8924e5455f365d47bbb619e098acec8de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 07:01:46 +00:00
TreeHugger Robot
cb0d5e24be Merge "Adding ApexInfo utility" into udc-dev 2023-03-10 06:11:13 +00:00
Alex Dale
6e5ab021d8 Add mutex to CdmEngine for use of cert_provisioning_.
[ Merge of http://go/wvgerrit/167618 ]
[ PoC http://ag/21922303 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
2023-03-09 14:01:40 -08:00
Presubmit Automerger Backend
0aef7b0dd2 [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284

Bug: 258188673
Change-Id: Id1ee612fa3efa0d9c001dba00d76ed137d1f9594
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
2023-03-09 04:21:32 +00:00
Alex Dale
48bfaab32f Add mutex to CdmEngine for use of cert_provisioning_.
[ Merge of http://go/wvgerrit/167529 ]
[ PoC http://ag/21900113 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
2023-03-08 20:19:44 -08:00
Alex Dale
491dfe7690 Add mutex to CdmEngine for use of cert_provisioning_.
[ Merge of http://go/wvgerrit/167500 ]
[ PoC http://ag/21891126 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
2023-03-08 20:18:00 -08:00
Alex Dale
7129e9c7ec Add mutex to CdmEngine for use of cert_provisioning_.
[ Merge of http://go/wvgerrit/167337 ]
[ PoC http://ag/21737796 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
2023-03-08 20:15:15 -08:00
Robert Shih
1c89cb3f1b Compact aidl exception message am: 3c9cbc6cbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21874559

Change-Id: I29c9974f3a77433bed9a942137dec6c66f06b49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 06:05:20 +00:00
Robert Shih
3c9cbc6cbe Compact aidl exception message
[ Merge of go/wvgerrit/c/cdm/+/167499 ]

Bug: 249941041
Change-Id: I81ce1ecef22bd87c6d879d1ccfd6874e9786f892
2023-03-07 19:08:02 +00:00
Edwin Wong
9874511eb0 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours am: ac68fb78b8 -s ours am: 2c4c12551f -s ours am: cedf65d414 -s ours am: 5552ec447f -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I9abbdd259bb95b6c94034684bf738fb6a41a3a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 06:09:56 +00:00
Edwin Wong
5552ec447f [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours am: ac68fb78b8 -s ours am: 2c4c12551f -s ours am: cedf65d414 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: Ida2ee9374cb9ebd525f9cc230a75db283d24afe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 05:48:54 +00:00
Edwin Wong
546c5c76de [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours am: c28a938337 -s ours am: b8b30aadf7 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I2c6af6d78aa2be6b9e40ddb712b830d86692339b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 05:14:56 +00:00
Edwin Wong
cedf65d414 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours am: ac68fb78b8 -s ours am: 2c4c12551f -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I3d65dea4740c81bdbb0636eef3fe19f505bf082e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 05:12:43 +00:00
Edwin Wong
2c4c12551f [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours am: ac68fb78b8 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I12431a19cc095ed11530745250a35566154ae078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:41:11 +00:00
Edwin Wong
b8b30aadf7 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours am: c28a938337 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I53a97374a687ed80ebbab6f4c82c6da9d8931de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:38:09 +00:00
Edwin Wong
ac68fb78b8 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I53a7ede31d47b3cb2c636c4a398b296575fb7e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:05:13 +00:00
Edwin Wong
c28a938337 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I6363ee51de3e60819ce46168cfd28741b033966a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:04:20 +00:00
Presubmit Automerger Backend
5af68c1600 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours am: c8c5914c43 -s ours am: 0ede12c0c9 -s ours am: e846526b94 -s ours am: 8a2772a968 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: Ia82d7b99ebb72dbf2b7a4ba453a07f882b3facf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:47:43 +00:00
Edwin Wong
58e4943a41 [automerger skipped] Fixed race condition in closeSession am: 4222daa047 am: 0d063388de am: b0f8ed6518 am: 09bf7fd932 -s ours am: 3d713549f8 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774

Change-Id: I4bc167d4fa5be52367363cc9e0519ea936a698bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:45:06 +00:00
Presubmit Automerger Backend
8a2772a968 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours am: c8c5914c43 -s ours am: 0ede12c0c9 -s ours am: e846526b94 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: Ifd805e0a0933ef3e53050baa88200733029039f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:25:42 +00:00
Edwin Wong
4e4f786a0b [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: Ic60d2c5e9224661a6f746461aee846ee38388cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:24:00 +00:00
Edwin Wong
3d713549f8 [automerger skipped] Fixed race condition in closeSession am: 4222daa047 am: 0d063388de am: b0f8ed6518 am: 09bf7fd932 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774

Change-Id: Iaad89d6898dd6450ce8f72e257a2045cd81e3787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:13:45 +00:00
Edwin Wong
c6aebda041 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I57cd6e58382b33e77434c746724cef9f0cc84c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 02:49:29 +00:00
Edwin Wong
10c9a1f4e6 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I506d74ecdd7a9802feec0dc8124d0b9c764bf8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 02:10:24 +00:00
Presubmit Automerger Backend
c3aa75f847 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours am: 353b214db3 -s ours am: d1594ce498 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: I11797faba312031a2f1e064ca52fd1e7c0018136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:54:03 +00:00
Presubmit Automerger Backend
e846526b94 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours am: c8c5914c43 -s ours am: 0ede12c0c9 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: I2197967fd10e1afeb2fba9d10ae6aaffc2fa3d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:52:26 +00:00
Edwin Wong
b2203809a1 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I2b87d3b73337af1b55ed6245e02dd8a302665323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:51:32 +00:00
Presubmit Automerger Backend
0ede12c0c9 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours am: c8c5914c43 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: I752b28746094139f06c159469b1e43ff7e7cbe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:18:25 +00:00
Presubmit Automerger Backend
d1594ce498 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours am: 353b214db3 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: I28acca532cd359c22ad0aacb617455954274b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:15:38 +00:00
Edwin Wong
58513d031e Fixed race condition in closeSession am: 97bbc07174
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I06263def49d360c37b8103c137a3e2ce95cce733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:15:30 +00:00
Edwin Wong
09bf7fd932 Fixed race condition in closeSession am: 4222daa047 am: 0d063388de am: b0f8ed6518
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774

Change-Id: Ie32cb2c358216cbdf4f47e732c06e77e8e268a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:01:15 +00:00
Edwin Wong
3dfe36cbed [automerger skipped] Fixed race condition in closeSession am: 4222daa047 am: 0dbe9fdc0d -s ours am: ac4ef6bfc7 -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 94f86b717c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774

Change-Id: I62110e2f1302d630af8e45e087c516f2de495e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:59:50 +00:00
Presubmit Automerger Backend
c8c5914c43 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: I1f6b0f7c24f455afa96e4d5d0c616a1666b9ca6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:42:53 +00:00
Presubmit Automerger Backend
353b214db3 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: I6b1fb4668bd3b16f7610347096ba59667753e741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:42:19 +00:00
Edwin Wong
b0f8ed6518 Fixed race condition in closeSession am: 4222daa047 am: 0d063388de
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774

Change-Id: Ieb1a7a2c8bd6d8d5d9488124cfb4998041232104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:25:12 +00:00