summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Add vts tests for new drm@1.1 methodsJeff Tinker2018-02-022-0/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: VtsHalDrmV1_1TargetTest Methods are for querying HDCP, security levels and number of sessions. Change-Id: Iaa865a0201a4c10b0c6b055aabab146dd31a2d01
* | | | | Merge "Fix incorrect comment in ICryptoFactory.hal"Jeff Tinker2018-02-021-3/+3
|\| | | |
| * | | | Fix incorrect comment in ICryptoFactory.halJeff Tinker2018-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment referenced drm@1.1::ICryptoPlugin which doesn't exist. bug:64001680 bug:33657579 Change-Id: I6905fb4b8e3e1386b999ba64a6ca5f160d1c4eff
* | | | | Add new secure stop methodsJeff Tinker2018-01-292-0/+61
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods are needed to release a secure stop by ID and return a list of secure stops. Tests: gts media tests bug:67361434 bug:64001680 Change-Id: I53cb0671b9b775e8da16bcc61008e1700466180b
* | | | Merge "Added definition for getMetrics to IDrmPlugin."Adam Stone2018-01-242-0/+112
|\ \ \ \
| * | | | Added definition for getMetrics to IDrmPlugin.Adam Stone2018-01-232-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added the appropriate type information for exporting metrics from a plugin. Bug: 64001676 Bug: 64001680 Change-Id: I9ccd4fbcf7201990e6d08c24e814e24833459a23 Test: Verified that the interface builds. No implementation, yet.
* | | | | Add new values to KeyRequestTypeRahul Frias2018-01-234-0/+77
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two additional KeyRequestTypes have been added, None and Update. None indicates that no key request is needed as keys have already been loaded. Update indicates that while keys have previously been loaded, an additional (non-renewal) license request is needed. Bug: 70335058 Test: make Change-Id: I43b7491110871332c3a79573773c441c2a4f5ccb
* | | | Create drm 1.1 HALJeff Tinker2018-01-215-0/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New methods are for querying HDCP, security levels and number of sessions bug:64001680 bug:33657579 Change-Id: Idb3d66a805ac530221536058614e0df8460e627b
* | | | Fix potential memory leak in default drm crypto pluginJeff Tinker2018-01-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:70205403 Test: manual play movies test forcing the legacy default widevine plugin to be used, instead of the widevine hidl service. Change-Id: Icb5b234999c5bf49b31d967814e48d42d9dd767f
* | | | Remove subdirsSteven Moreland2017-11-281-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing whenever I see these in code reviews. Test: none Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
* | | | Merge "Cleanup drm_hal_clearkey_test."TreeHugger Robot2017-11-151-35/+29
|\ \ \ \
| * | | | Cleanup drm_hal_clearkey_test.Edwin Wong2017-11-131-35/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To stay close to the original test, the only time the test will abort is when it encounters errors in Setup. The following changes are applied in this CL: - #include <openssl/aes.h> should be sorted alphabetically - gtest macro should follow convention of ASSERT_EQ(expected, actual) - removed unused variables: num, ecount_buf and kNotSecure - TestQueryKeyStatus needs to call closeSession() - moved and renamed test dependent global constants: e.g. k256SubSampleByteCount, k512SubSampleClearBytes and k512SubSampleEncryptedBytes - use isOK() for checking Status::OK, e.g. ASSERT_TRUE(cryptoPlugin->setMediaDrmSession(sessionId).isOk()); Test: VTS test adb shell /data/nativetest/VtsHalDrmV1_0TargetTest/VtsHalDrmV1_0TargetTest bug: 68735305 Change-Id: Ic8f43b4c35644bf7223f24a531eae818e59e0f4a
* | | | | Updating makefiles for hidl_interface.Steven Moreland2017-11-131-168/+25
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 64487114 Test: manual Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812 Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
* | | | Add tests to validate key length for clearkey plugin. am: cc77a50e96 am: ↵Edwin Wong2017-11-031-12/+105
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01802815eb am: 36c9c34bdb am: d29bc78ec9 Change-Id: Idbae7b29df1f71b331a13d31e47de925bceb4514
| * | | | Add tests to validate key length for clearkey plugin. am: cc77a50e96 am: ↵Edwin Wong2017-11-031-12/+105
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01802815eb am: 36c9c34bdb Change-Id: Ibb92aa618ceec88721ed807819d31516ab70595c
| | * | | Add tests to validate key length for clearkey plugin. am: cc77a50e96Edwin Wong2017-11-031-12/+105
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 01802815eb Change-Id: I298891316951cc6ba5f000b796fb60c0b4f76290
| | | * | Add tests to validate key length for clearkey plugin.Edwin Wong2017-11-031-12/+105
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: cc77a50e96 Change-Id: Id61b8d76ef30a6c66edd10cd48b4ecdad795165d
| | | | * Add tests to validate key length for clearkey plugin.Edwin Wong2017-11-021-12/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AesCtrDecryptor::decrypt() doesn't check whether the size of "key" is equal to 16 bytes, which may lead to an OOB read problem in the context of mediadrmserver. The fix is in clearkey plugin. Add tests to validate the fix. Test: VTS test adb shell /data/nativetest/VtsHalDrmV1_0TargetTest/VtsHalDrmV1_0TargetTest bug: 63982768 Merged-In: Ife2da17e7f39d8031bc36b83c3b27ba5e9d83eb7 Change-Id: Ife2da17e7f39d8031bc36b83c3b27ba5e9d83eb7
* | | | | Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1Steven Moreland2017-10-111-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 116161d94e Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
| * | | | Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1Steven Moreland2017-10-111-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6c811964a1 Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
| | * \ \ \ Update for Soong java makefiles.Steven Moreland2017-10-111-1/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c3e80fa01e Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
| | | * | | | Update for Soong java makefiles.Steven Moreland2017-10-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: pass Bug: 33420795 Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
* | | | | | | Merge "Update for hidl adapter module defaults." am: 988c977079 am: ↵Steven Moreland2017-10-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 861651985f am: b53e6ad535 am: 9a17f41f6f Change-Id: I78d9292068b372238554fd9d35128e69f5b5f9d2
| * | | | | | Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985fSteven Moreland2017-10-041-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b53e6ad535 Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
| | * | | | | Merge "Update for hidl adapter module defaults."Steven Moreland2017-10-041-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 988c977079 Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
| | | * | | | Merge "Update for hidl adapter module defaults."Treehugger Robot2017-10-041-0/+1
| | | |\ \ \ \
| | | | * | | | Update for hidl adapter module defaults.Steven Moreland2017-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: pass Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
| | * | | | | | Merge "Use -Werror in hardware/interfaces"Chih-hung Hsieh2017-10-043-7/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 85bb01dd6b Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
| | | * | | | | Use -Werror in hardware/interfacesChih-Hung Hsieh2017-10-043-7/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused local variables. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9
* | | | | | | Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-dev am: d85a098767Edwin Wong2017-10-041-31/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cd6c66c430 Change-Id: Ie2c9939fa3b9f26cd9c0f64006fd8f9912f795cd
| * | | | | | Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-devEdwin Wong2017-10-041-31/+57
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | am: d85a098767 Change-Id: I29d4ea563a7d855bfd07c4624faf0d89577d6515
| | * | | | | Fix VtsHalDrmV1_0Target clearkey tests.Edwin Wong2017-10-041-31/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix the following issues: - queryKeyStatus is now implemented, do not return ERROR_DRM_CANNOT_HANDLE anymore - expectedKeyRequest and knownKeyResponse should use '-' and '_' instead of '+' and '/' for base64Url encode; one uint8_t change from 0x2b to 0x2d for each vector 2. Add tests to create clearkey drm and crypto plugin using both common pssh box format system ID and clearkey scheme UUID. Test: Vts test on Marlin and Taimen adb shell /data/nativetest/VtsHalDrmV1_0TargetTest/ VtsHalDrmV1_0TargetTest Test: Cts ClearKeyTest on Marlin and Taimen ANDROIOP= ./android-cts/tools/cts-tradefed run cts -m CtsMediaTestCases --test android.media.cts.ClearKeySystemTest Test: ClearKey plugin unit tests adb shell LD_LIBRARY_PATH="/vendor/lib/mediadrm" /data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest Test: netflix and Play Movies & TV for sanity check bug: 66327050 Change-Id: Icfbe715cf246a7c5253d5f104d0fd446618b18bd
* | | | | | | Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3 am: ↵Steven Moreland2017-09-271-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71a193a425 am: 9fdd241905 Change-Id: I1c852fa6600fecc44d5afd1a65a5f51c43ecf71c
| * | | | | | Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3Steven Moreland2017-09-261-1/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | am: 71a193a425 Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
| | * | | | | Merge "Fix typo in update makefiles."Steven Moreland2017-09-261-1/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 9960148420 Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
| | | * | | | Fix typo in update makefiles.Steven Moreland2017-09-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 37518178 Test: pass Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
* | | | | | | Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e am: b94d0c7290Steven Moreland2017-09-261-1/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 97228c0b7d Change-Id: Ic4b459b7c1a4325453945b0b00db8f44e4e77c26
| * | | | | | Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7eSteven Moreland2017-09-261-1/+80
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b94d0c7290 Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
| | * | | | | Update makefiles for hidl adapter.Steven Moreland2017-09-251-1/+80
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 26a0bb2762 Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
| | | * | | | Update makefiles for hidl adapter.Steven Moreland2017-09-252-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 37518178 Test: manual Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
* | | | | | | Add 'vendor.' prefix to a vendor HAL service nameJaekyun Seok2017-09-121-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent property name collisions between properties of system and vendor, 'vendor.' prefix must be added to a vendor HAL service name. You can see the details in http://go/treble-sysprop-compatibility. Test: succeeded building and tested on a walleye device Bug: 36796459 Change-Id: I4e8fbee791ec917a8f627a1366f4d44ec7e6febc
* | | / / / Merge changes from topic "fix-omx-dependencies" am: d429b1f9e7 am: 4e8e84e10bMartijn Coenen2017-09-111-0/+2
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | am: 4b5313cbdf Change-Id: Id06c5e5047a7df2fa084d6fbc2536a54919550a2
| * | | | Merge changes from topic "fix-omx-dependencies"Martijn Coenen2017-09-111-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d429b1f9e7 Change-Id: Ic50e4bc973f6a16f0ed1a1f051dc354e69b0e39d
| | * | | Make camera/drm helper classes available to system.Martijn Coenen2017-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As VTS tests are considered system and link against these. Bug: 38302533 Bug: 62523241 Test: builds Change-Id: Iac5c872c58ec9646d6d6974aacceb930daad7e5e
| | * | | Remove dependency to libmediadrm from drm HALJiyong Park2017-09-0611-24/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drm HAL has been using libmediadrm for android::SharedLibrary class and android::PluginLoader class. This is a Treble violation since libmediadrm is a framework-only library that is not available to vendors. To solve the problem, the two classes are copied into this directory to form a small static library android.hardware.drm@1.0-helper.a. Bug: 38302533 Test: mm under /hardware/interfaces/drm/1.0/default and /hardware/interfaces/drm/1.0/vts/functional Change-Id: I7b4e5cdb3bc815e971e0c3b7ec99ea86042e13eb
| * | | | Allow clearkey tests to run if no vendor modules am: 5db2e67293Jeff Tinker2017-08-181-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a538a0711e Change-Id: Id57f15057791c88c84f268a8a69374b42561ed47
| | * \ \ \ Allow clearkey tests to run if no vendor modulesJeff Tinker2017-08-181-3/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | am: 5db2e67293 Change-Id: I4507467925abf52954535df5a50ae7494f6b4bac
| | * | | | Updating all makefiles.Steven Moreland2017-08-141-1/+4
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | am: dfd8287506 Change-Id: I915b69ab3a46f25b9abeb525066d6ea89d162176
| | | * | | Updating all makefiles.Steven Moreland2017-08-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 64487114 Test: none Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0 Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180 Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
| * | | | | Updating all makefiles.Steven Moreland2017-08-112-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 64487114 Test: none Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0 Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 08:57:19 +0000