Commit Graph

7357 Commits

Author SHA1 Message Date
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
1020db3fd7 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 7c24330ea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ic460c355c0054022bdd9d42774fa899834174c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:48:24 +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
92e4664459 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: e61b02b417
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

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

Change-Id: I54c088c8fd6cbf06edb332510f080bf205d60206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:45:43 +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
7c24330ea9 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: Ie069f3802cf7e65ed7cb1b39858ad37114f3c25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:30:06 +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
e61b02b417 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: I1e41ab9e15d3394f6886d292d20d14e42806ccd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:29:07 +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
e4593c5836 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: Iaac091db712fa3e0069179bb6779407cf4c14967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:07:32 +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
1aed4f6cdb Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: b4bf3eca79 am: 0f1b379d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

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

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

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

Change-Id: I4557207c508b8ef9b21a8d4e4dc1b48d3b75fe4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:20:18 +00: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
Kyle Zhang
fa7062e2c1 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: 0ef103b048
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

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

Change-Id: I00c93833499f31682a5ac1d5825185e3c5d85699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:45:39 +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
Kyle Zhang
0ef103b048 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: Icadda8c3544429b4a62dd5f2a0bab5e63a7eaccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:00:20 +00:00
Kyle Zhang
7d3b62c8f6 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: Idc1db8960465c991ac6f4d91492191afdd8db70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:00:16 +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
Cong Lin
b15b3f0a59 Add BccParser to internal factory upload tool am: 5ce29c42da am: 3a14535bb1 am: 181d11105c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I0f5a46f21083f36b209cc829073f6d3c4a597d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 00:57:43 +00:00
Cong Lin
14fa41acb1 Add BccParser to internal factory upload tool am: 5ce29c42da am: 5232dda438 am: eefc85b404
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I18a1dccfd7749b7161e245776f2f6f9fc4963850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 00:52:20 +00:00
Cong Lin
181d11105c Add BccParser to internal factory upload tool am: 5ce29c42da am: 3a14535bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I43a33f793e480d97052909ff63db0c4f05d3752f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 00:40:35 +00:00
Cong Lin
eefc85b404 Add BccParser to internal factory upload tool am: 5ce29c42da am: 5232dda438
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: Ie7231fcdfa150ab0f01aa6ab2543649ae9af7065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 00:31:43 +00:00