widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,917 Commits 2 Branches 0 Tags
e13c05112990940ce364f2341a294ab016087367
Commit Graph

5917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
cf3ac9e62c Added write protection for session to engine map. am: b6cdd12394 am: b7aa89024e am: 5dec140676 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I3747f52437613560492da45c70d92f686ed1bd83
 2021-07-02 17:16:40 +00:00
Alex Dale
7a026dfb02 Added write protection for session to engine map. am: b6cdd12394 am: f17153dfb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I575071070156986ee7b5d05709a12f0dd80fbfc7
 2021-07-02 17:07:41 +00:00
Alex Dale
5dec140676 Added write protection for session to engine map. am: b6cdd12394 am: b7aa89024e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I02aa84ef497a1ac8fb6ae4b04aec85133819ccd5
 2021-07-02 17:07:16 +00:00
Alex Dale
4d8bc8ff51 Added write protection for session to engine map. am: b6cdd12394 am: 24697f9301 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I3dc869e6cf9ed07816fb70f96ae89ae1211b5ff0
 2021-07-02 17:07:05 +00:00
Alex Dale
b7aa89024e Added write protection for session to engine map. am: b6cdd12394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: Ic1c256fdee0f52a3d56879782c83f5b01f93788c
 2021-07-02 16:59:32 +00:00
Alex Dale
f17153dfb1 Added write protection for session to engine map. am: b6cdd12394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: If37cc5a40be8d798ec7de7ef9d112df40f484291
 2021-07-02 16:58:48 +00:00
Alex Dale
24697f9301 Added write protection for session to engine map. am: b6cdd12394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I41e30a806afe31c16c8a4597eff156107256d86a
 2021-07-02 16:58:25 +00:00
Alex Dale
b6cdd12394 Added write protection for session to engine map. 
[ Merge of http://go/wvgerrit/128325 ]

There were a few cases where |cdm_by_session_id_| was being iterated
over and the CDM did not acquire any write-protection locks to prevent
other threads from changing the map simultaneously.

In particular, it was possible that while cleaning up a CDM, and
removing all the associated session in |cdm_by_session_id_| another
CDM could have been opening a session and creating a new association
in |cdm_by_session_id_| at the same time.

Cases where |cdms_| and/or |cdm_by_session_id_| is being written to or
iteratively read from should require a lock.  The iterator of
std::map maintains a "view" into the map's tree structure.  Modifying
the map (inserting or deleting elements) can potentially change the
structure of the map and the underlying assumptions built into an
iterator's view (ex, the iterator thinking there is an element to the
left or right).

Modifying the value within the map can potentially cause problems, but
is not applicable in our case (we modify the object pointed to by the
map element, but not the pointer itself).

Bug: 190405462
Test: build_and_run_all_unit_tests.sh and MediaDrmTest
Change-Id: I043e238570dac9a0db990f8fe66be271062b965c
 2021-07-01 18:37:18 -07:00
TreeHugger Robot
5f89ef9852 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix L3 clock loading issue" into sc-v2-dev am: bb62a534bf am: 54c00460d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54ffedd68950a3ba36d99401431cd6bae9a64af0
 2021-07-02 00:00:25 +00:00
Cong Lin
3e23e4b618 [automerger skipped] [RESTRICT AUTOMERGE] Fix L3 clock loading issue am: e98c9150df am: 75495dff9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide77fed52a6a7a6b131b2fd18bc666cbe0bd18ba
 2021-07-02 00:00:23 +00:00
TreeHugger Robot
54c00460d3 Merge "[RESTRICT AUTOMERGE] Fix L3 clock loading issue" into sc-v2-dev am: bb62a534bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15113030

Change-Id: I556317618e53fcf5711f2c44e6aedfb7e4902550
 2021-07-01 23:47:44 +00:00
Cong Lin
75495dff9a [RESTRICT AUTOMERGE] Fix L3 clock loading issue am: e98c9150df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15113030

Change-Id: I906a6286557c897b984a403926d439f8e3b4bf0d
 2021-07-01 23:47:41 +00:00
TreeHugger Robot
bb62a534bf Merge "[RESTRICT AUTOMERGE] Fix L3 clock loading issue" into sc-v2-dev 2021-07-01 23:34:58 +00:00
Rahul Frias
89313f6cc9 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 48cc9dccc9 am: 17414e43a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: I8e813e043c4967b4095195a4f56c2d91eddaf9c3
 2021-07-01 21:30:54 +00:00
Rahul Frias
01128bdedc Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 5f2fd5a07f am: 5755a56e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: Iab0281017e2ed2bbefe6b643dc9245eec19f935d
 2021-07-01 21:30:48 +00:00
Rahul Frias
17414e43a0 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 48cc9dccc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: I31ff95bd87318a561b7a0935ecaca32fdb2db0e8
 2021-07-01 21:18:59 +00:00
Rahul Frias
5755a56e28 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 5f2fd5a07f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: Id9c6587a5469c560fec27adde55db88346d65565
 2021-07-01 21:18:37 +00:00
Rahul Frias
dd72a8179a Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 9fe7626938 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: I41b02cb18a2193fda1e002c06629aa34df2c30c9
 2021-07-01 21:18:13 +00:00
Rahul Frias
5f2fd5a07f Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: Iaffb18bcff400cf00a31f95ee9368d94f55d93ff
 2021-07-01 21:09:44 +00:00
Rahul Frias
48cc9dccc9 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: Ife61e9e478484773ae9829b762b8fc861c74a646
 2021-07-01 21:09:13 +00:00
Rahul Frias
9fe7626938 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: I5fd3e854098826b368f5a76b91750a3fef07fee0
 2021-07-01 21:08:53 +00:00
Rahul Frias
a3657ab200 Merge "Disable expiration for legacy DRM certificates" into sc-dev 2021-07-01 21:00:14 +00:00
Rahul Frias
5773e245a0 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: b7ebaab335 am: 309f816a54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: Iedc856b01682c916c868eb9b84ffe23606b1eb78
 2021-07-01 19:46:19 +00:00
Rahul Frias
3a8f43cfd5 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: 44cde1757a am: 109b43e1a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: I10e9a94a7aca93b2d9f12e7d5862a6420400d2c2
 2021-07-01 19:45:30 +00:00
Rahul Frias
309f816a54 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: b7ebaab335 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: Icc3776a12052b6727baca109d9edba261787d77e
 2021-07-01 19:37:14 +00:00
Rahul Frias
109b43e1a1 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: 44cde1757a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: Ib15fa5350d01b51a447713409d00552e1ff399c7
 2021-07-01 19:36:55 +00:00
Rahul Frias
67639f2a42 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: 38209bedb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: I280ee9296643f7f328fb99b4cb5dd42b6189a8fb
 2021-07-01 19:36:29 +00:00
Rahul Frias
44cde1757a Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: I6417a1091f4d69055c2ecbed6e79bcc61b80f109
 2021-07-01 19:29:43 +00:00
Rahul Frias
b7ebaab335 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: If80e26d82eca8b8bb97d227ee06c76d267422458
 2021-07-01 19:29:15 +00:00
Rahul Frias
38209bedb6 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: Ie5e04820cabb094efe752b8185145ca74bcafccc
 2021-07-01 19:29:13 +00:00
Rahul Frias
151d0b15d3 Disable expiration for legacy DRM certificates 
[ Merge of http://go/wvgerrit/128163 ]

In android S, we added a feature b/169740403 [Limited lifespan DRM
certificates with license preservation]

Due to uncertainties of when the provisioning service will
launch, we are disabling expiration for legacy DRM certificates.
If the feature does not launch in time, existing DRM certificates
will expire and be replaced. Offline licenses associated with these
expired DRM certificates will fail to load.

Expiration of legacy certificates will be reenabled at a later time.
The main portion of feature, the issuing of new DRM certificates with
expiration time will still be supported.

Bug: 192428783
Bug: 169740403
Test: WV unit/integration tests
Change-Id: I1d1184249848f215953a837f369528d3b74c9618
 2021-07-01 19:24:02 +00:00
Rahul Frias
d30c5043d1 Merge "Correct an error reported when a license is restored and then released" into sc-dev 2021-07-01 19:17:21 +00:00
Alex Dale
e76c1cd239 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: 5500df9681 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I6afda98c3cb8261f6efd6bf4b97839211f9ae8e5
 2021-07-01 07:54:44 +00:00
Alex Dale
5500df9681 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: If69362ccf3179cf4f287175dd061fe8eb2b26f2a
 2021-07-01 07:41:28 +00:00
Alex Dale
aebb29986f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: f56fdbef3f am: c4946e61c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I3256b058450ec73eac41c89947228b9efb188c79
 2021-07-01 07:21:23 +00:00
Alex Dale
bd36f43d35 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: 4ed10d691f am: ca0ce02872 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: Iccbdf48ea02e7342675560f1a19f49ff228f41a5
 2021-07-01 07:21:12 +00:00
Alex Dale
c4946e61c4 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: f56fdbef3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I2dd797a0364519fb1b7e700a8e3c099f808cc04c
 2021-07-01 07:09:50 +00:00
Alex Dale
ca0ce02872 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: 4ed10d691f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: Icd40761b28213d02f849dbcb7cf46e73eebe3f3b
 2021-07-01 07:09:28 +00:00
Alex Dale
4ed10d691f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I4c6493fd8a2abfdddcaa6b6b694122b814c27118
 2021-07-01 06:57:30 +00:00
Alex Dale
f56fdbef3f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I37155d9ab27ed16bb21a873f4827aa9684db4da2
 2021-07-01 06:56:25 +00:00
Alex Dale
1229aedcea Merge "PST and non PST can handle unlimited license durations." into sc-dev 2021-07-01 06:45:07 +00:00
Alex Dale
df47a7732a Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: da0d78bf0b am: abc0311f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I82eeeea0ff441ec23f270989d435614c77671cf9
 2021-07-01 06:06:48 +00:00
Alex Dale
208389b23e Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: d7f36baddc am: 6ef83672ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I6dab034c4b618b4cd6ab8d88bbb9c8b70d73df66
 2021-07-01 06:06:37 +00:00
Alex Dale
abc0311f93 Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: da0d78bf0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I32aadbe3815e84f87933447c0baf832d3bc5b6e7
 2021-07-01 06:03:02 +00:00
Alex Dale
5a3a50262f Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: 5e2297dc7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: Ic6e44caa6530313f50f15048f8cc2d50bcc07e81
 2021-07-01 06:02:33 +00:00
Alex Dale
6ef83672ca Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: d7f36baddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: Ibe2b1d69ffbb53e46b1da09696a782af3edc9d77
 2021-07-01 05:57:29 +00:00
Alex Dale
da0d78bf0b Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I975afd30a91155770f9e21e48db5184ef63440f4
 2021-07-01 05:51:31 +00:00
Alex Dale
5e2297dc7e Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: Ib3bc83382a539fee11d6ad8ec43bdf2c1170d078
 2021-07-01 05:50:42 +00:00
Alex Dale
d7f36baddc Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I59fb3001fe68c6d7a34844957552b552207a35ba
 2021-07-01 05:49:52 +00:00
Alex Dale
16a0ab2309 Merge "Updated integration test to handle unlimited license durations." into sc-dev 2021-07-01 05:35:29 +00:00