summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: ↵Automerger Merge Worker2020-01-091-0/+1
|\ | | | | | | | | | | 86828796ac am: 44fa9a5cf0 am: 0e8630788f Change-Id: I73b41a1aebe7dec987e637ca30c9d65b1aedc41e
| * default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: ↵Automerger Merge Worker2020-01-091-0/+1
| |\ | | | | | | | | | | | | | | | 86828796ac am: 44fa9a5cf0 Change-Id: Ie67b811fe2a172d9a33458ed5c23578c71a0a221
| | * default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796acAutomerger Merge Worker2020-01-091-0/+1
| | |\ | | | | | | | | | | | | Change-Id: I4fac71fd9946d37a7a3b1d32a611f007de3e5303
| | | * default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3Automerger Merge Worker2020-01-091-0/+1
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ifaa69ef0ed98f90a42a66b7b64ef9d61457af107
| | | | * default drm hidl: Fix decrypt destination base ptrRobert Shih2019-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 144351324 Test: poc_CryptoPlugin_155 Change-Id: Id5d221cd6978d55c46c0368aceb10c1d2f559fd9
| | * | | default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447feRobert Shih2019-09-111-4/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 756f134fcc Change-Id: I4289e38c6eab3e8cac9e489a08f74b3efcf008f9
| | | * | default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]Robert Shih2019-09-111-4/+31
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: d22f1447fe Change-Id: I480b83a0c4ffd752637ff5357b30d6f5c1916b4b
| | | | * default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]Robert Shih2019-09-111-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reject native handle output for clearkey * validate subsample sizes Bug: 137370777 Test: cryptopoc Change-Id: I2a81f2a00ebf7954b16fb10d2af586ce0da801ed
* | | | | default hidl CryptoPlugin: security fixesRobert Shih2019-09-111-4/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1e18883b72 Change-Id: Ifbbc3cf6c827085046259365808d962ad192c55a
| * | | | default hidl CryptoPlugin: security fixesRobert Shih2019-09-111-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reject native handle output for clearkey * validate subsample sizes Bug: 137370777 Test: cryptopoc Change-Id: Idf075e1a297fe1ab3ea3e1621806dd46b4a51e35
* | | | | Adapt change clearkey to Lazy halzhangweiwei2019-07-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exempt-From-Owner-Approval Bug:135896867 Test: vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target Change-Id: Iadba7a7afdccfe8a6299e3c0e1e03f63a58c5ca8
* | | | | Add status for license starting in the futureRobert Shih2019-05-086-9/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:116738851 Test: vts-tradefed run commandAndExit -m VtsHalDrmV1_2Target Change-Id: Id5017e3ffa1fcf5aaad1815b59a425ac63f2e53e
* | | | | Merge "DrmHalTest.OfflineLicenseStateTest: search keySetId"Robert Shih2019-03-121-5/+22
|\ \ \ \ \
| * | | | | DrmHalTest.OfflineLicenseStateTest: search keySetIdRobert Shih2019-03-111-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search for key set id instead of simply checking the number of total offline licenses. Fix LOG_TAG & remove clearkey specific comments from generic plugin tests. Bug: 118402843 Test: VtsHalDrmV1_2TargetTest Change-Id: I245007317c813d5a8585d0a4ee29816b8f51ad3c
* | | | | | Amend drm@1.2 vts mock errorsRobert Shih2019-03-081-5/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 118402843 Test: VtsHalDrmV1_2TargetTest Change-Id: I05cc92d33a50b37ce12d8295cdd129d2653836d1
* | | | | Merge "Add vts tests for new drm@1.2 methods"Robert Shih2019-03-088-0/+1599
|\ \ \ \ \
| * | | | | Add vts tests for new drm@1.2 methodsRobert Shih2019-03-068-0/+1599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 118402843 Test: VtsHalDrmV1_2TargetTest Change-Id: If0da1538c33e0284fa6fa6dd48d56a0ce1753f02
* | | | | | Merge "Update makefies: no 'types' internal"Steven Moreland2019-03-051-5/+0
|\ \ \ \ \ \
| * | | | | | Update makefies: no 'types' internalSteven Moreland2019-03-041-5/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 123976090 Test: N/A Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
* | | | | | Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6Steven Moreland2019-03-042-23/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | am: 7224bc9bcf Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
| * | | | | Update makefies: no 'types'Steven Moreland2019-03-042-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 123976090 Test: N/A Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
* | | | | | Update makefiles.Steven Moreland2019-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 123976090 Test: N/A Change-Id: I5fb6c126a090a3fe0fa4829ea9224564133dc1ae
* | | | | | Fix comment on removeOfflineLicenseJeff Tinker2019-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:117570956 Change-Id: Iad1a15d81066d01387ec9addd420040155216a75
* | | | | | Add securityLevel to MediaDrm isCryptoSchemeSupported APIJeff Tinker2019-01-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:110701831 test: cts media test cases, widevine integration tests Change-Id: I9e4679ee63b3997f7141c9b81fd6f375e862862d
* | | | | | Add support for HDCP 2.3Jeff Tinker2019-01-142-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:120040804 Change-Id: Id4643829bce31131e3bc7b628737579bb597e736
* | | | | | Add additional error conditions to MediaDrmJeff Tinker2019-01-105-20/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New codes are being added to handle resource contention, lost session state, frame size too large and insufficient security level for decryption. Also cleans up inconsistent use of tamper detected error where invalid state error should have been used. bug:111504510 bug:111505796 test: cts and gts media test cases Change-Id: I8581aed1871d728f7af80b246d0dba28b40fa4a3
* | | | | | Add lazy service target for drm HALPeter Kalauskas2019-01-086-36/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Run gts on Pixel 1/2/3, marlin_svelte, and walleye_svelte Bug: 112386116 Change-Id: I5d86e3158794ebae967efb009a0cef8cd140ccb7
* | | | | | Merge "Fix performance-for-range-copy warnings" am: d01f7050ac am: 51e835ce22Chih-hung Hsieh2018-12-172-18/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 86fefab5e9 Change-Id: Ib139d710d47a7a51e24ba8ba582b252f5ff6e244
| * | | | | Fix performance-for-range-copy warningsChih-Hung Hsieh2018-12-172-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 30413223 Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance* Change-Id: I1b76a22eab100a31e77048626e48169fe7eeaf92
| * | | | | pack VTS cc_test binaries as general-testsKeun Soo YIM2018-12-072-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make general-tests Bug: 120093339 Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4 Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
* | | | | | pack VTS cc_test binaries as general-testsKeun Soo YIM2018-11-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make general-tests Bug: 120093339 Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
* | | | | | Define offline methods in DRM HAL version 1.2Jeff Tinker2018-11-085-0/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:117570956 bug:110838441 bug:116252891 Change-Id: Ie94d5c2174d851eb2b40dcc7bf4596af71e14176
* | | | | | Merge "DRM 1.1: Add VINTF doc" am: 8ad3e78d27 am: 2524404aaeYifan Hong2018-10-261-0/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: adf2018492 Change-Id: Iff1292a68022495c06438ba479dffc41520e2ace
| * | | | | DRM 1.1: Add VINTF docYifan Hong2018-10-251-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: none Bug: 73556059 Bug: 111192666 Bug: 111096955 Bug: 117636317 Bug: 112150995 Fixes: 112282263 Change-Id: I361f50b5af19094c36f928939ca6d764ce59a205
| * | | | | Fix failing drm 1.0 vts testsJeff Tinker2018-09-133-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shared library path was incorrectly set based on the drm.64bit.enabled flag. It should be set based on whether the drm service is running as 32-bit or 64-bit. Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target bug:111289939 Change-Id: I388dc87bd4566211dc2901feccf1e6e1c90bfe67 Merged-In: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
* | | | | | Remove spurious error log messageJeff Tinker2018-07-311-1/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change id Ie2f306bce6aec697ae584da3f55b3cf72edaa07b, a shared memory leak was fixed using a workaround that maintained compatibility with the frozen DRM HAL API 1.1. Unfortunately it triggered an error log message that was no longer an error condition. This change just removes the log line to avoid raising undue concerns. Change-Id: I9abe08ef5ab86b2f8589a5c1e5c5175e19ab09d2 Test: Compiles Bug:111131173
* | | | | Fix failing drm 1.0 vts testsJeff Tinker2018-07-203-7/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shared library path was incorrectly set based on the drm.64bit.enabled flag. It should be set based on whether the drm service is running as 32-bit or 64-bit. Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target bug:111289939 Change-Id: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
* | | | Add more drm@1.1 VTS structure testsJeff Tinker2018-03-271-3/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding tests for: getKeyRequest_1_1 getSecureStopIds releaseSecureStops removeSecureStop removeAllSecureStops test:vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target bug:73330999 Change-Id: Icd6c3e679ea674f899563a8d8e428321a7783633
* | | | Update Makefiles Missed In Previous CommitsNathan Harold2018-03-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling update-makefiles.sh there are some unrelated changes that were missed in previous commits. Bug: 8675309 Test: compilation Change-Id: I5bf67fbcc809de36bde1869ada7b835566a5198b
* | | | Merge "Convert drm hal test to use VtsHalHidlTargetTestEnvBase"Zhuoyao Zhang2018-02-202-1/+32
|\ \ \ \
| * | | | Convert drm hal test to use VtsHalHidlTargetTestEnvBaseZhuoyao Zhang2018-02-132-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The testEnvBase template is only used to register the testing hal. * The service name is specifically determined by the test logic, so disable the feature for vts to run the test against all service instance (by setting HalServiceCombMode::NO_COMBINATION) Bug: 64203181 Test: make vts vts-tradefed run vts -m VtsHalDrmV1_0Target vts-tradefed run vts -m VtsHalDrmV1_1Target Change-Id: Ib2e005e8ccbc815067f0e9455fcd3e6c5ec151fb
* | | | | Merge "Revert "Revert "VTS tests for fixed MediaDrm security level APIs"""TreeHugger Robot2018-02-121-49/+82
|\ \ \ \ \
| * | | | | Revert "Revert "VTS tests for fixed MediaDrm security level APIs""Jeff Tinker2018-02-111-49/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6ec159b78041506efd7467672b5fd4c89f3d90c1. Change-Id: I7e54e28c5e4b4c9f70d53d045bbfec57f7ef58c3
| * | | | | Revert "VTS tests for fixed MediaDrm security level APIs"Tobias Thierer2018-02-111-82/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 45c3855f4fc04fc80f354139b7f084ca817f3db1. Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h. https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log Change-Id: Ie61888464a2ac17b1ee6f47b23f5bb84fdbfa095
| * | | | | VTS tests for fixed MediaDrm security level APIsJeff Tinker2018-02-081-49/+82
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendors implementing the newly added MediaDrm.setSecurityLevel HAL found that it was difficult to implement properly. Also the semantics are somewhat ambiguous from the Java platform API level. The APIs have changed to bind the security level assignment to openSession which clarifies the API for apps as well as making it more natural to implement in HAL modules. This CL updates the VTS tests to account for those changes. bug:72831697 bug:64001680 test: VtsHalDrmV1_1TargetTest, GTS media tests Change-Id: I2adf13f9da7726b206df6fcc82b1e2e11fc94674
* | | | | Revert "Revert "Fix MediaDrm security level APIs""Jeff Tinker2018-02-111-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a824afa9c416fe62d91296aa8fef9f0dfb7f571d. Change-Id: Ia8f3090454f010a507ac386767b2c2a11dce1ac4
* | | | | Revert "Fix MediaDrm security level APIs"Tobias Thierer2018-02-111-29/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6a5934aee3b1313daf82d6063827e9a4f4c96ab6. Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h. https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log Change-Id: I8a1ce95ca6f48bec6c46f84a0fef7a48f975c406
* | | | | Fix MediaDrm security level APIsJeff Tinker2018-02-081-18/+29
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During development of the vendor/widevine HAL module, the newly added MediaDrm.setSecurityLevel method was found to be difficult to implement efficiently since the security level is needed at the time a session is opened. This CL moves the security level parameter to openSession to resolve this problem. bug:72831697 bug:64001680 test: VtsHalDrmV1_1TargetTest, GTS media tests Change-Id: Id9c765131d0ee6fa85f83d098955acf603229b46
* | | | Add getMetrics test to drm vts test.Adam Stone2018-02-021-3/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds test cases for the getMetrics call in the DRM 1.1 HAL clear key implementation. Bug: 64001680 Test: VtsHalDrmV1_1TargetTest Change-Id: I7c292f79f7477a6a88296aa62eae02cc70e35102
* | | | Merge "Add vts tests for new drm@1.1 methods"TreeHugger Robot2018-02-022-0/+376
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 08:19:30 +0000