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

7321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cong Lin
1430cd0bd2 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 am: 5c75bc6cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: Ida8685cf3c66d3e3c9810be4676d1f72e40d2979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 01:57:43 +00:00
Cong Lin
d03ca0b017 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 am: dae2668d93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: I0bb1370a9edd2a2ae5ce3edca040efd88e687b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 01:55:52 +00:00
Cong Lin
8f2e922859 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 am: dae2668d93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: I6818114f54c24bdecf2d8a846eea63cc8bcdd30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 01:55:49 +00:00
Kyle Alexander
cf47b70b0b Update gts/cts helper script with WVTS paths 
Test: ./run_gts_and_cts_tests.sh

Bug: 276784713
Change-Id: Ifede9156403c24812da12fe1a3182060d97ecd04
 2023-05-02 01:32:56 +00:00
Cong Lin
dae2668d93 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: I9b6a55f4ad156e341c7fa56be4d9ea8d521f6abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 01:16:05 +00:00
Cong Lin
5c75bc6cf0 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: Ib37e118519e3d8021469dc5d87a065a520389b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 01:13:35 +00:00
Alex Dale
37f125a491 Piped CdmEngine's generic crypto operations to Android CDM. 
[ Merge of http://go/wvgerrit/172010 ]

The CdmEngine provides an API for generic crypto operations that are
already used for the CE CDM.  This API is being exposed in the Android
CDM.  The parameter order of the Android CDM is modified to match the
existing generic crypto parameters used in the media DRM plugin.

Bug: 274984456
Bug: 29400687
Test: build x86-64 and Android
Change-Id: I3b286ebb011bd58754b7b8ea814ed46daf1f62f9
 2023-05-01 15:50:39 -07:00
Alex Dale
da6437fe5e Exclude the default CDM from metrics history. 
[ Merge of http://go/wvgerrit/173410 ]

The DRM plugin opens and closes many CDMs using the default identifier.
These metrics are not needed when checking the metric history and will
no longer be stored.  Default CDM metrics will continue to appear in
the live metrics list.

Bug: 239462891
Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Change-Id: I64662a44e9c084cc0f08c5a3f013dbf86374ac2d
 2023-05-01 15:37:34 -07:00
Cong Lin
9651c61e25 Fix session id in dynamic adapter and re-generate L3 
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/173330

Skipping files that are not in android from the CL above.

Original commit message:

Pass the real oemcrypto session id from `pair.session` instead of
`session`, since `session` can be changed when L1 and L3 are running in parallel and `session` in that case may not be the correct oemcrypto session id any more.

Also adding a few missing v18 L3 functions pointers to the dynamic
adapter.

Need to re-generate L3 since the L3 sources changed.

Test: L3 unit tests
Test: GTS dash policy tests and Dexter tests
Bug: 271290471
Bug: 279967915
Change-Id: Idc44d57ca38eb1de24c0038917800e37c25b9afc
 2023-05-01 19:25:27 +00:00
Alex Dale
c86d2892a6 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 990b79e0a1 am: 67326b600c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I063146c90b5d3b97ece226a2959a1b5fb4840e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 02:10:06 +00:00
Alex Dale
e0cfc3aaaa Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: d9deaf40c3 am: ddc623a729 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I17bf7af0dfab71dc7fc9b8047d22caea10bcf907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 02:09:20 +00:00
Alex Dale
2af28ea321 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 am: 65dc08a6a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I3faf9fea4cf317c6caa0299bb450d060aa529cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:32:57 +00:00
Alex Dale
29117018ed Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 am: 5e645f59dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: Id08f1d437c4b81a57e8e142311a539b57bb17351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:32:48 +00:00
Alex Dale
b4a74dda35 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 am: ba62072d25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: Ic795afe9ee8fb8659941ee61033be4ede9181205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:32:42 +00:00
Alex Dale
67326b600c Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 990b79e0a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: If537bb7bdd358c56bf37a71338a8710bff46fb92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:32:37 +00:00
Alex Dale
ddc623a729 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: d9deaf40c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I77f4008e432acf771b2f3f1cbdc1b17b5af6f764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:32:00 +00:00
Alex Dale
f2be057561 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 am: a3f9eb8074 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I054d24eb7fe7e24c89f22017ea4ae45bc18adb89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:07:58 +00:00
Alex Dale
990b79e0a1 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ic6441e51c9b69827d301d5354cf319ed74bdb31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:07:38 +00:00
Alex Dale
0c9e7ced04 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 am: a70355ef3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: Iaf07f33fbdf634853a9de1ba64546fb4e881e605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:07:36 +00:00
Alex Dale
b9e57c48b0 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 am: f77886adcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: Ic439ee62bc198c0f90ce25dc401cbd3b03735f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:07:02 +00:00
Alex Dale
078b178f8c Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 30a7e4e41a am: 8a12146aa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I00c484ac3d66a2e1204b6675b2f079e434fe3a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:06:44 +00:00
Alex Dale
d9deaf40c3 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I1bb402c80a36f0fdc8b05d7510990193805a1681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:06:36 +00:00
Alex Dale
65dc08a6a1 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I571270121f287d66d36ba4edcb025ac750c7ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:50:49 +00:00
Alex Dale
5e645f59dd Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I89f91af785c5c8e75fdc5a0e263ea7e329b59a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:50:23 +00:00
Alex Dale
ba62072d25 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I218eb3950be0fc7686ccc34bb64f7244310c9be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:49:29 +00:00
Alex Dale
a3f9eb8074 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Iac56c6efb88a505153b5ed5ddd752c50199c69d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:47:57 +00:00
Alex Dale
a70355ef3d Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I3748cf75bfcd81edf0c6803844b6682943355b3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:47:24 +00:00
Alex Dale
f77886adcf Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I459f3f5c407fda26683aa3ddd18c10b3b4088a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:47:15 +00:00
Alex Dale
8a12146aa1 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 30a7e4e41a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I94e054184075c7145c772abcff15c7e95268e77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:30:55 +00:00
Alex Dale
2747f5f997 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ib5fc267391fb3c512eb0df864116c33af44a30a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:29:45 +00:00
Alex Dale
1ada326822 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I1728dc0c1f5a267f585528b8696b0f9795827878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:29:01 +00:00
Alex Dale
3e650cfd9f Merge "Allow metrics history to outlive the Android CDM." into udc-dev 2023-04-29 00:17:49 +00:00
Alex Dale
7b32faf9f8 Merge "Include metric history in dumpsys." into udc-dev 2023-04-29 00:15:57 +00:00
Alex Dale
600c37d848 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I2301c09456e5ded57e7627dad111fc01b4296cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:09:23 +00:00
Alex Dale
30a7e4e41a Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I52dd951e7ebdd8252151feeb0754d8386796fcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:03:20 +00:00
Alex Dale
b5a7412675 Merge "Added metrics history for WV CDM for Android." into udc-dev 2023-04-28 23:39:33 +00:00
Rahul Frias
9d1c9ca76a Add error details when offline license is not found 
[ Merge of http://go/wvgerrit/171310 ]

Offline license not found errors are identified by CdmResponseEnum
347 (KEYSET_ID_NOT_FOUND_4). No addition file system information
is shared.

Checks for file existance use the stat command. The stat call can
return error codes from errno.h when the command fails.
These are now converted into sub error codes and returned along with
the offline license file not found error.

This also includes a change to log stat errors other than
ENOENT (no such file or directory) as a warning rather than verbose.

Bug: 276225520
Test: file_store_unittest, file_utils_unittest, GtsMediaTestCases
Change-Id: Ic09d036549582cd65783b49fa96ffefc4bf562c7
 2023-04-28 02:38:35 -07:00
Kyle Zhang
0f1b379d90 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: b4bf3eca79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I3a6ce55292f5d18faa6111b613782bb11e6adf7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:51:15 +00:00
Kyle Zhang
9bcb153d53 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: b0c01b626f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I4a62eea4ce26431ef5eb8a2c68635a812cff3653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:50:49 +00:00
Kyle Zhang
821e12e359 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: 17d8250be7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I8da67a81cb392a22fdfecc7cc57e77c2e839e945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:47:55 +00:00
Kyle Zhang
7897f6d232 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: 7377a5d5fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I0bae2dd9857cfda761664c9dbf6ffca5365fde08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:47:50 +00:00
Alex Dale
4b267e37f9 Allow metrics history to outlive the Android CDM. 
[ Merge of http://go/wvgerrit/172910 ]

The lifecycle of the Android CDM is controlled by Android's strong/
weak pointer functionality.  Unfortunately, it does not provide an
easily predictable point in the code where the CDM is to be deleted
along with the saved metrics.  In order to allow the CDM to keep a
list of metrics that are persistent with the life of the service, a
global thread safe queue is provided which is created when the first
CDM is created, but will out live the CDM.

The metrics will still be deleted when the DRM service is terminated.

Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Change-Id: Id98676d8b5278798b4de332cc272cd5b85024244
 2023-04-27 15:31:39 -07:00
Kyle Zhang
17d8250be7 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I8d56ed62c9e7d80cfc0bf1a955fd78441ce2f512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:46 +00:00
Kyle Zhang
7377a5d5fd Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I73e138c6497227e1f4cc7609d149f016fa9da245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:40 +00:00
Kyle Zhang
b4bf3eca79 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I121b770abd7a3a5340cefca7c45d800656ded4b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:31 +00:00
Kyle Zhang
b0c01b626f Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: Ic43da161a9098b9907029deea70a75198a294dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:29 +00:00
Alex Dale
666e26284f Include metric history in dumpsys. 
[ Merge of http://go/wvgerrit/171470 ]

Dumping the DRM plugin metrics will now include any saved instances of
the CDM metrics that may be available.

Bug: 239462891
Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: atest GtsMediaTestCases
Change-Id: I24d3e0771b50fd20212568a7fd5654691ae51f93
 2023-04-27 14:54:17 -07:00
Alex Dale
c42627a23e Added metrics history for WV CDM for Android. 
[ Merge of http://go/wvgerrit/171271 ]

There is a need to maintain a short history of metrics from CDMs which
have been deleted.  This CL adds this ability to the Android version
of the WV CDM.  The history cannot yet be maintained for long, as the
WV CDM instance is destroyed if unused.

Further changes are required to the plugin to maintain the history
beyond the life-cycle of the CDM instance, and to properly format
its output.

Bug: 239462891
Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: atest GtsMediaTestCases
Change-Id: I81c0996602722a9795fc3951030d20bb39b5816b
 2023-04-27 14:54:17 -07:00
Kyle Zhang
5409567ef9 Merge "Fix prebuilt apexes" into udc-dev 2023-04-27 21:21:11 +00:00
Kyle Zhang
c01cd91d92 Merge "Create different targets for each Widevine apex" into udc-dev 2023-04-27 21:21:11 +00:00