Commit Graph

6671 Commits

Author SHA1 Message Date
Robert Shih
f8bd90fe71 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I354f65e931b14d00f0f7da7951e94e3a1a89f67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 07:39:39 +00:00
Robert Shih
186e489562 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev 2022-05-16 06:17:33 +00:00
Alex Dale
50ecd3d9bc Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e am: 3b1f15ddee am: 8709d9322d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I44537da13e6a9df5c1ab34494373b94e1a1364cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 20:51:27 +00:00
Alex Dale
17ee50727e Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca am: c9c8ecd1e3 am: 931d425f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

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

Change-Id: I59f5b2289e92570696e62ce6792ad075714edeb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 19:37:51 +00:00
Alex Dale
4bc8b86263 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: c01aca1d4d am: ca085f1d41 am: 5c07a8b6b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I028fb796717ad44cce3dd0d7a090de9584aabf24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 19:08:42 +00:00
Alex Dale
8709d9322d Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e am: 3b1f15ddee
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

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

Change-Id: I82817064a5368a1c51abddacca39ba194f913d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 19:06:36 +00:00
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
3b1f15ddee Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I85184973cdf55c6ef21729c06c7f9404056657d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:39:53 +00:00
Alex Dale
c9c8ecd1e3 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: I521b19d7a705a28b9c29b27fccb50af1fa027f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:39:36 +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
97638781d6 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 3c82ad605d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I461ae5b896396aff9949242d897d743fef3609ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:39:19 +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
11a55d2e8e Move system ID extraction outside of CryptoSession. am: 9d169a00bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

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

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

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

Change-Id: I9d7c3f7636650c68459a0cfab60900cac5c801f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 14:40:15 +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
9ffe02116a Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: b3bc24aaf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I1598e1e56e4ace0d19c82cd6fa5edf0d21d28a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:49:21 +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
b3bc24aaf1 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: Icb1244bfa2831f36d63fcdb5db96a9ae17e10b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:02:13 +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
4e4a8b61e8 Merge "Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf" into tm-d1-dev-plus-aosp am: df80023bde am: 5fbc87c2b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

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

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

Change-Id: I4e6d9066a7a9aaacca3f7bd50f9f0b31a3750b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:50:05 +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
db1484cf56 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 8cc0db4a89
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I414efe4d3f25f1af4bfb68ff82202abb95cd37b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:29:11 +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
8cc0db4a89 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: I6ad4d5573686317a4d1aece16f9136936dbc8faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:09:34 +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
c6595a1da2 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: 2305263b2d am: 26d232ada4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

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

Change-Id: If81cff2e33800f110f707b8d96e0cef5c6a96e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:03:46 +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