widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,354 Commits 2 Branches 0 Tags
40677ed2738c534c54b66cb8cd4c8602369677fd
Commit Graph

6354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
40677ed273 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca am: 62c43f71d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I4ea1dc01ec99b19d65578d9ab052a0ec423cf2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:05:41 +00:00
Alex Dale
62c43f71d4 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ia7f7342cb648251893282c56c899f944afd81eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:33 +00:00
Alex Dale
e28711c3ca Move system ID extraction outside of CryptoSession. am: 9d169a00bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ifa0f6c87c52a3090edc3977d86522163bb68738b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:20:40 +00:00
Alex Dale
9d169a00bb Move system ID extraction outside of CryptoSession. 
[ Merge of http://go/wvgerrit/151391 ]

This CL moves the logic for extracting the system ID from keybox or
OEM certificate (from OEMCrypto or device files) to a dedicated
SystemIdExtractor.

Before Provisioning 4.0, the system ID could only be found from data
returned by OEMCrypto.  However, with provisioning 4.0, the system ID
can now be found in the OEM certificate that is stored on the device
files.

Bug: 232020319
Test: system_id_extractor_unittest
Test: Forest L37800000954493485
Change-Id: Ie1b7987906e2e4fef015cd659a947b6dbb7594b1
 2022-05-12 19:22:03 -07:00
Alex Dale
5c07a8b6b5 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: c01aca1d4d am: ca085f1d41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I3be107f966d20edae9b7f7cc1077bd3d80712e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:05:57 +00:00
Alex Dale
0700ba921b Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 am: a669b0acfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Icc4483ce83f56816f7179e7d61e70b1e7371a999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:01:49 +00:00
Alex Dale
60a7610484 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 am: f298a5adca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I8b094f4202a7276dc41709336e855626122e80d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:57:29 +00:00
Alex Dale
f298a5adca Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ie48bb4f7460e193c5d678c98a4086bf1fbf80517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:40:18 +00:00
Alex Dale
ca085f1d41 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: c01aca1d4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ia7c19d70f0c0c695f06a25cbec1e1b962666d1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:39:44 +00:00
Alex Dale
a669b0acfd Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I2319d49bbaba97d0020f12167625fa4632136449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:39:20 +00:00
Alex Dale
53e513dc05 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ifac854ca29c96aff77a35f59e726ede451828929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:04:01 +00:00
Alex Dale
c01aca1d4d Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ia06436ff571d566428b059e3cfb7e052988f4e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:01:56 +00:00
Alex Dale
8ac7ca3f46 Merge "Added metrics for production readiness." into tm-dev 2022-05-12 22:10:24 +00:00
Automerger Merge Worker
5fbc87c2b6 Merge "Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf" into tm-d1-dev-plus-aosp am: df80023bde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I65a49d03efe0c164777b1f7f09b5126fe1a1ff6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:46:04 +00:00
Edwin Wong
2ce23c5a30 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 am: 990a818041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Iba92111ba36f11681de6c3e40f85c3b0f4b7cff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:45:43 +00:00
Edwin Wong
4879f9a555 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 am: ba8e028d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Ia580f19f62383ff5669b97859b42b1fb903f7681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:45:19 +00:00
Automerger Merge Worker
df80023bde Merge "Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf" into tm-d1-dev-plus-aosp 2022-05-12 03:30:02 +00:00
Edwin Wong
ee0dee053b Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I37198ee18979f45e702fe5e338abb243ae1966c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:59 +00:00
Edwin Wong
990a818041 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Ifb08a21ad728b6e03e27b23f772f7d84931f6a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:58 +00:00
Edwin Wong
ba8e028d3b Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I7967755fcea35ab9518d9f640a4fdf3dfb110e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:55 +00:00
Edwin Wong
67522b7b65 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I2f20175c6204807803a0745de0d47e06e8042fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:10:44 +00:00
Edwin Wong
e277ac0aaf Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Ic0e965c34364ace57f6b10b8ddbaf637b954d1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:09:13 +00:00
Edwin
26d232ada4 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: 2305263b2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Ic3cbaa0f2989f7a5d328edd4db1299e1db7378ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 00:33:28 +00:00
Edwin
e8a63dc927 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: c4d06d6ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: I121f0077b533b98444593f52deb465b35495ffa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 00:32:02 +00:00
Edwin Wong
cf3771e54a Add hal_metrics_adapter_unittest for AIDL service. 
[ Merged from http://go/wvgerrit/151750 ]

Test: m hal_metrics_adapter_unittest -j128
Test: m hal_metrics_adapter_unittest  WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/hal_metrics_adapter_unittest  /data/nativetest/.
Test: adb shell  LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/hal_metrics_adapter_unittest

Bug: 217247987
Change-Id: I0c890d2fab754bf993632659293a0272c863b11f
 2022-05-11 22:01:35 +00:00
Edwin
2305263b2d Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: I59bc66217b8170a2ad369732bbb8ac6e4dcf4fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:40:42 +00:00
Edwin
c4d06d6ea6 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Ieb328c30bd47b7863b614ed8c451507f60d9b704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:30:43 +00:00
Edwin
0d86212819 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 56594f7018 am: c31ba7f4ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: I3e633b4f8edde38ef56e26999a82f0aae4519b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:01:03 +00:00
Edwin
9586d34201 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Idc534a847bf4d3a592fc0217178b8e1740e9ab21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:55:27 +00:00
Edwin
c31ba7f4ff Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 56594f7018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Ifdd79ef8b1b8b7de61da5d26861f4e7d57b62e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:36:56 +00:00
Edwin
56594f7018 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: I6d8b16e2da6c3a4fa96f699f2dcdcf2e3de21271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:18:35 +00:00
Edwin
5202862e9a Add libwvdrmdrmplugin_hal_test for AIDL service 
[ Merged from http://go/wvgerrit/150769 ]

- remove OpenSessions_1_1, only applies to hidl
- move plugin and mCdm creation in SetUp() test fixture
- reset plugin and mCdm smart pointers in TearDown
- reduce code duplication
- remove MockDrmPluginListener, send*Event has gone private

Test: m libwvdrmdrmplugin_hal_test -j128
Test: m libwvdrmdrmplugin_hal_test WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/libwvdrmdrmplugin_hal_test /data/nativetest/.
Test: adb shell LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/libwvdrmdrmplugin_hal_test

Bug: 217247987
Change-Id: I8bc0a390a88facbc890cf26872fd089afe87850a
 2022-05-11 05:36:40 +00:00
Alex Dale
88a7ff7685 Added metrics for production readiness. 
[ Merge of http://go/wvgerrit/151749 ]

Extended CryptoSession for recording the result of
OEMCrypto_ProductionReady().

Only OEMCrypto_SUCCESS is considered "production ready".  With the
exception of OEMCrypto_ERROR_NOT_IMPLEMENTED, any other result is
vendor-specific and indicates not being production ready.

Bug: 231655151
Test: metrics_collections_unittest
Change-Id: Ia0e5603d7ee1290238cce63d0194ae1aced424c1
 2022-05-10 18:04:11 -07:00
Robert Shih
fe8fbeae37 Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e am: 4d928c4906 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386

Change-Id: Ieed12d1edc37a73011ee5976b181cd906533fc72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:42:20 +00:00
Robert Shih
ea913d0b3a Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e am: f5a65bec87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386

Change-Id: If42eac8ffc9572e3456b1a78f0a77b00ba705aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:42:03 +00:00
Robert Shih
4d928c4906 Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386

Change-Id: I79b5410b3ca4afa015c4f4fef4c63f36c470d2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:16 +00:00
Robert Shih
f5a65bec87 Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386

Change-Id: Ife931e549deb37776967e6932eb1a23da5ed5495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:15 +00:00
Edwin Wong
62e7b8f855 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 am: 0d71f292ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: Ib3970251527802f8fc4806d09bf73e937b9639ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:15:42 +00:00
Edwin Wong
1c2455efa4 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: cba60f02a9 am: 310347ff63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: I03256162d7ddfef674c298b3e66a3d434d383d00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:15:30 +00:00
Edwin Wong
9c23a58b07 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 am: 900cf7bf2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: Id22b09023fcbda2852fa2563faf28b7db97cd270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:15:03 +00:00
Robert Shih
63ad411c0e Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev 2022-05-11 00:10:36 +00:00
Edwin Wong
900cf7bf2e Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: Id8041755dd4685c8f7d33f4e014cfcf97cdeddad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:51:43 +00:00
Edwin Wong
0d71f292ac Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: Ib2878aeb966a701e758805877969e02a4d332951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:51:42 +00:00
Edwin Wong
310347ff63 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: cba60f02a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: Iec6f953fb2e7bd96fd2f133661d25a56b77f4cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:42:41 +00:00
Edwin Wong
2054705413 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: I836dd3e5a995d261133c73e99137078827d0f680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:25:36 +00:00
Edwin Wong
cba60f02a9 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: I4a3a7fa6a4ae632f9deb42e51fc7ee1e5aa8c71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:23:59 +00:00
Edwin Wong
f8146ee716 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev 2022-05-10 23:12:05 +00:00
Automerger Merge Worker
822fe79ab8 Merge "Added CDM support for production readiness reporting. am: cd5afa88a6 am: 867954b412 am: 72eeca4e98" into tm-qpr-dev-plus-aosp 2022-05-10 22:56:44 +00:00
Alex Dale
70ff0dbb90 Added CDM support for production readiness reporting. am: cd5afa88a6 am: 867954b412 am: 72eeca4e98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696

Change-Id: I6c124810d28152cf2affe9b2b466bd61bf1fa4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:56:41 +00:00
Alex Dale
d98dc4f92e Added CDM support for production readiness reporting. am: cd5afa88a6 am: 6fe5fe9b47 am: 3aa2a55386 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696

Change-Id: I7fb378063ae765c88ed75bbbb494893553140f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:56:39 +00:00