Commit Graph

  • 6d09561e82 Merge "Threading requirements of UsageTableHeader." into tm-dev am: cbea9a11ef Alex Dale 2022-03-24 04:06:10 +00:00
  • d3c653bd11 Merge "Sync license_protocol.proto" into tm-dev Rahul Frias 2022-03-24 03:58:21 +00:00
  • 27d2826d03 Merge "Correct when OEMCrypto_GetOEMPublicCertificate is called" into tm-dev TreeHugger Robot 2022-03-24 03:52:42 +00:00
  • e1c107bd8f Merge "Update ExoPlayerDemo.apk" into tm-dev TreeHugger Robot 2022-03-24 02:27:11 +00:00
  • c014da7da3 Correct when OEMCrypto_GetOEMPublicCertificate is called Rahul Frias 2022-03-23 16:28:47 -07:00
  • 3912635502 Sync license_protocol.proto Rahul Frias 2022-03-23 00:45:21 -07:00
  • 5d139b2933 Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" into tm-mainline-prod Alex Dale 2022-03-23 23:56:53 +00:00
  • 5ba7ab4d25 Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" Alex Dale 2022-03-23 23:56:53 +00:00
  • cbea9a11ef Merge "Threading requirements of UsageTableHeader." into tm-dev Alex Dale 2022-03-23 23:56:53 +00:00
  • 1cc217351a Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 TreeHugger Robot 2022-03-23 23:33:08 +00:00
  • 7cab9e5031 Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 TreeHugger Robot 2022-03-23 23:32:51 +00:00
  • 26ee600923 Merge "Copied OEMCrypto utils to Android." into tm-dev TreeHugger Robot 2022-03-23 23:16:15 +00:00
  • b705d68631 Update ExoPlayerDemo.apk Kyle Alexander 2022-03-23 15:22:11 -07:00
  • 691a355fbe [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 2p: 6bff1691c5 Presubmit Automerger Backend 2022-03-23 18:54:33 +00:00
  • 6bff1691c5 [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 Presubmit Automerger Backend 2022-03-23 18:54:27 +00:00
  • 64047c8958 Threading requirements of UsageTableHeader. Alex Dale 2022-03-22 16:38:46 -07:00
  • a415b078ea [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505 2p: e7ba29b5ae Frederick Mayle 2022-03-23 18:00:14 +00:00
  • e7ba29b5ae [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505 Frederick Mayle 2022-03-23 18:00:08 +00:00
  • 3112fd5505 libwvdrmengine: Fix double ownership of WVDrmFactory Frederick Mayle 2022-03-23 17:58:43 +00:00
  • 0f3c297250 Replace _hidl_ with _hal_ in test names Edwin Wong 2022-03-22 17:38:20 +00:00
  • f3024f2a93 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de am: 5867bbec85 TreeHugger Robot 2022-03-22 23:57:57 +00:00
  • 5867bbec85 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de TreeHugger Robot 2022-03-22 23:33:34 +00:00
  • 8b4efe6eb9 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de TreeHugger Robot 2022-03-22 23:33:21 +00:00
  • c58cc6d5e4 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 am: 534dad1777 Rahul Frias 2022-03-22 23:27:29 +00:00
  • dddd1142de Merge "Enable Widevine Aidl service." into tm-dev TreeHugger Robot 2022-03-22 23:17:15 +00:00
  • 09db0f4f27 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 Rahul Frias 2022-03-22 23:06:57 +00:00
  • 534dad1777 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 Rahul Frias 2022-03-22 23:06:08 +00:00
  • d210233e58 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev Rahul Frias 2022-03-22 21:51:32 +00:00
  • 253a804c57 Enable Widevine Aidl service. Edwin 2022-03-10 09:04:47 -08:00
  • d9f2a671f9 Added key_session_ guard to SelectKey. am: 1fac6fa5de am: dba939b5ee Alex Dale 2022-03-22 05:46:59 +00:00
  • 6cfc1e06bf Added key_session_ guard to SelectKey. am: 1fac6fa5de Alex Dale 2022-03-22 05:32:35 +00:00
  • dba939b5ee Added key_session_ guard to SelectKey. am: 1fac6fa5de Alex Dale 2022-03-22 05:31:41 +00:00
  • 4a065adc33 Copied OEMCrypto utils to Android. Alex Dale 2022-03-21 21:22:19 -07:00
  • 587516dfa2 Return error first if the returned status is not ok Rahul Frias 2022-03-21 14:43:54 -07:00
  • b07523f4c6 Constrain the generated key type in testing Rahul Frias 2022-03-21 14:41:01 -07:00
  • a6a99c416f Free EC key in test session destructor Rahul Frias 2022-03-21 14:37:58 -07:00
  • 1fac6fa5de Added key_session_ guard to SelectKey. Alex Dale 2022-02-22 17:26:47 -08:00
  • 31d2dc1658 Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev am: cff6103321 am: 26dbb06de3 Rahul Frias 2022-03-17 18:22:46 +00:00
  • 26dbb06de3 Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev am: cff6103321 Rahul Frias 2022-03-17 17:36:54 +00:00
  • f53715e25d Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev am: cff6103321 Rahul Frias 2022-03-17 17:36:42 +00:00
  • cff6103321 Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev Rahul Frias 2022-03-17 16:39:36 +00:00
  • 85310dfbf6 Change the signature format requirement of OEMCrypto_GenerateCertificateKeyPair Rahul Frias 2022-03-14 02:59:03 -07:00
  • 1ab6872f82 Fix EnsureProvisioned for double provisioning Rahul Frias 2022-03-14 02:56:52 -07:00
  • d6362f6e6b Update fuzz tests to match output desriptor struct Rahul Frias 2022-03-14 02:54:21 -07:00
  • e64dd05e25 Use default url to inform app of prov40 stages Rahul Frias 2022-03-14 02:50:31 -07:00
  • 139310fd05 Fix key_control_iv in OEMCrypto tests Rahul Frias 2022-03-14 02:46:27 -07:00
  • b448a70645 Fix jenkins/opk_optee after v17 merge Rahul Frias 2022-03-14 02:18:08 -07:00
  • fd00a8af24 Remove old test license holder Rahul Frias 2022-03-14 02:15:04 -07:00
  • 13da693dd6 Generic crypto tests: use license holder Rahul Frias 2022-03-14 02:11:59 -07:00
  • 41b5bd18de Reboot tests: verify offline license is valid after reboot Rahul Frias 2022-03-14 02:09:01 -07:00
  • 3fd20d9b28 Policy integration tests: use license holder Rahul Frias 2022-03-14 01:55:20 -07:00
  • 3da1d24a1d Integration tests: add license holder Edwin 2022-03-10 09:28:23 -08:00
  • 6cda6717a9 Reboot test: Initialize fake clock Rahul Frias 2022-03-13 18:35:54 -07:00
  • 520368cea2 Reboot test: save large files Rahul Frias 2022-03-13 18:33:39 -07:00
  • 57353b4941 Test max number of DRM private keys Rahul Frias 2022-03-13 18:26:49 -07:00
  • 5f45485175 Merge oemcrypto-v17 to master Rahul Frias 2022-03-13 18:17:17 -07:00
  • 83a4100d11 Update cipher mode elsewhere Rahul Frias 2022-03-13 17:42:09 -07:00
  • 4532802ea0 Fix 1 ClangTidyBuild finding: Rahul Frias 2022-03-13 16:45:28 -07:00
  • bc6e841ccd Add out of bounds testing for LoadKeys() Rahul Frias 2022-03-13 16:33:19 -07:00
  • 8350badbb5 Separate invalid session test for ReuseUsageEntry Rahul Frias 2022-03-13 16:28:46 -07:00
  • 4fbefccb3a Merge "Build both AIDL and HIDL targets." into tm-dev am: 9361eb803b am: bb26fe14e2 Edwin Wong 2022-03-14 21:35:52 +00:00
  • bb26fe14e2 Merge "Build both AIDL and HIDL targets." into tm-dev am: 9361eb803b Edwin Wong 2022-03-14 21:10:47 +00:00
  • 03cb9e4ba1 Merge "Build both AIDL and HIDL targets." into tm-dev am: 9361eb803b Edwin Wong 2022-03-14 21:10:08 +00:00
  • 9361eb803b Merge "Build both AIDL and HIDL targets." into tm-dev Edwin Wong 2022-03-14 20:31:42 +00:00
  • 77f1fedde2 Build both AIDL and HIDL targets. Edwin 2022-03-10 08:44:43 -08:00
  • 3ad026ab04 Merge "wv aidl: fix native handle memory leak 2" into tm-dev am: 6eb5161dc1 am: 90b85ced5a TreeHugger Robot 2022-03-11 06:03:14 +00:00
  • b94f645290 Merge "wv aidl: fix native handle memory leak 2" into tm-dev am: 6eb5161dc1 TreeHugger Robot 2022-03-11 05:42:18 +00:00
  • 90b85ced5a Merge "wv aidl: fix native handle memory leak 2" into tm-dev am: 6eb5161dc1 TreeHugger Robot 2022-03-11 05:40:49 +00:00
  • 6eb5161dc1 Merge "wv aidl: fix native handle memory leak 2" into tm-dev TreeHugger Robot 2022-03-11 05:20:59 +00:00
  • 8b7135134f Add lazy service for Widevine AIDL HAL. am: 28feb283f3 am: 0bf6d6a469 Edwin 2022-03-10 19:50:53 +00:00
  • 366b54d522 Add lazy service for Widevine AIDL HAL. am: 28feb283f3 Edwin 2022-03-10 19:29:18 +00:00
  • 0bf6d6a469 Add lazy service for Widevine AIDL HAL. am: 28feb283f3 Edwin 2022-03-10 19:27:46 +00:00
  • 28feb283f3 Add lazy service for Widevine AIDL HAL. Edwin 2022-03-05 07:06:10 -08:00
  • af7da0db1f Merge "Update dump() for Aidl HALs." into tm-dev am: f2384c1b22 am: f8ac8e07d4 TreeHugger Robot 2022-02-28 18:41:11 +00:00
  • a4489b0998 Merge "Update dump() for Aidl HALs." into tm-dev am: f2384c1b22 TreeHugger Robot 2022-02-28 18:20:32 +00:00
  • f8ac8e07d4 Merge "Update dump() for Aidl HALs." into tm-dev am: f2384c1b22 TreeHugger Robot 2022-02-28 18:19:49 +00:00
  • f2384c1b22 Merge "Update dump() for Aidl HALs." into tm-dev TreeHugger Robot 2022-02-28 17:55:35 +00:00
  • 24fa58799b Revert "Enable Widevine Aidl service." am: 304da5e399 am: bb3db4073a Sam Dubey 2022-02-28 08:46:49 +00:00
  • 6d4656c416 Revert "Enable Widevine Aidl service." am: 304da5e399 Sam Dubey 2022-02-28 08:26:42 +00:00
  • bb3db4073a Revert "Enable Widevine Aidl service." am: 304da5e399 Sam Dubey 2022-02-28 08:25:31 +00:00
  • 304da5e399 Revert "Enable Widevine Aidl service." Sam Dubey 2022-02-28 05:57:22 +00:00
  • b5284c5376 Update dump() for Aidl HALs. Edwin 2022-02-23 17:45:44 -08:00
  • 0b378e2bd1 Enable Widevine Aidl service. am: 2269503129 am: a3a6f1e853 Edwin 2022-02-25 20:41:20 +00:00
  • b346e7ef85 Enable Widevine Aidl service. am: 2269503129 Edwin 2022-02-25 20:33:18 +00:00
  • a3a6f1e853 Enable Widevine Aidl service. am: 2269503129 Edwin 2022-02-25 20:17:49 +00:00
  • 6b7f2f34a9 libwvdrmengine: Add custom CDM properties for ARCVM Jeffrey Kardatzke 2022-02-16 12:03:58 -08:00
  • 21cbd7906e [automerger skipped] Merge "aidl drm: independent min/max SecurityLevel for each supported mime" into tm-dev am: 3fa23b250b -s ours am: 89cd3b2b46 -s ours Robert Shih 2022-02-23 17:48:53 +00:00
  • 89cd3b2b46 [automerger skipped] Merge "aidl drm: independent min/max SecurityLevel for each supported mime" into tm-dev am: 3fa23b250b -s ours Robert Shih 2022-02-23 17:14:02 +00:00
  • 2269503129 Enable Widevine Aidl service. Edwin 2022-02-22 21:23:27 -08:00
  • 9386d774f1 [automerger skipped] Merge changes from topic "cherrypick-SupportedContentType-myxl3uejg2" into tm-mainline-prod am: 438a40b016 -s ours Robert Shih 2022-02-23 16:51:14 +00:00
  • c5aa870dbd wv aidl: fix native handle memory leak 2 Robert Shih 2022-02-23 09:27:31 +00:00
  • 87c09d08a1 Merge changes from topic "cherrypick-SupportedContentType-myxl3uejg2" Robert Shih 2022-02-23 02:08:46 +00:00
  • 438a40b016 Merge changes from topic "cherrypick-SupportedContentType-myxl3uejg2" into tm-mainline-prod Robert Shih 2022-02-23 02:08:46 +00:00
  • 3fa23b250b Merge "aidl drm: independent min/max SecurityLevel for each supported mime" into tm-dev Robert Shih 2022-02-23 02:08:46 +00:00
  • 436511707e [automerger skipped] Merge "wv aidl: fix native handle memory leak" into tm-dev am: 06587fd100 -s ours am: 14a161b77a -s ours Robert Shih 2022-02-22 20:40:36 +00:00
  • b2800169e0 [automerger skipped] Merge "Update cipher mode enumeration in AIDL WvDrmPlugin" into tm-dev am: 7b3a37fa2f -s ours am: c668b798ec -s ours Robert Shih 2022-02-22 20:40:29 +00:00
  • 2687bcf667 [automerger skipped] Merge changes from topic "presubmit-am-53eaa6b33a3a42bba34a4724a8ebe4b0" into tm-mainline-prod am: 176c4f4e2a -s ours Robert Shih 2022-02-22 20:40:21 +00:00
  • 5eae50d688 [automerger skipped] Merge changes from topic "presubmit-am-69964c88cf1f4ba9b4fac91dde2f2412" into tm-mainline-prod am: c5c74fa36d -s ours Robert Shih 2022-02-22 20:39:34 +00:00
  • 14a161b77a [automerger skipped] Merge "wv aidl: fix native handle memory leak" into tm-dev am: 06587fd100 -s ours Robert Shih 2022-02-22 20:38:15 +00:00
  • c668b798ec [automerger skipped] Merge "Update cipher mode enumeration in AIDL WvDrmPlugin" into tm-dev am: 7b3a37fa2f -s ours Robert Shih 2022-02-22 20:37:55 +00:00