)]}' { "log": [ { "commit": "696a6a144e36b1fcc94142ee48d186cc0cc139ee", "tree": "da154ce51af0585815c05bc9afafa032ab9aac0c", "parents": [ "f3f261a7c8bbdc2dbe2a92e4fe3f10830c0ae6b1" ], "author": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Mon Oct 15 15:41:20 2018 -0700" }, "committer": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Wed Jan 30 09:26:07 2019 -0800" }, "message": "Add new lazy service target to clearkey\n\nTest: Reboot device and make sure clearkey HAL is not running. Run gts.\nBug: 112386116\nChange-Id: I8ef1c88b64cfb3a292abfd31b3dda82c6cd73ef9\n" }, { "commit": "99dbfa822e277956799e987c106d4ec1b7984f1b", "tree": "d5ab50d0657b41554e0594ebb9a30f058ca3d1e3", "parents": [ "701768e80731da3df0edac97fb8fc442ffbbd33f" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Jan 17 17:27:06 2019 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jan 22 23:27:10 2019 +0000" }, "message": "Add securityLevel to MediaDrm isCryptoSchemeSupported API\n\nbug:110701831\ntest: cts media test cases, widevine integration tests\n\nChange-Id: Ia4308a27a11a279db1fb127c51d752ecaa86dfcb\n" }, { "commit": "44c2cc4e1637d6f7c43f14f0dbd6f078497719a2", "tree": "06359af63d9914277f39b322ffcf46fa3761c9a6", "parents": [ "0ddaa5966b8980670bf08ba4a90823967fb3654e" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jan 14 10:24:18 2019 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jan 14 23:18:33 2019 -0800" }, "message": "Add support for HDCP 2.3\n\nbug:120040804\nChange-Id: I937fb776f93fb0041e6f152bb12b6d1e84c2188f\n" }, { "commit": "b8684f3a673dff814d68b2f695991e554718fd8b", "tree": "7eb43a0d55dadf57c43c9058233e73e37dcad76e", "parents": [ "a280b264cd99be8d682e3a5c14b1d25649481100" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 12 08:41:31 2018 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Jan 10 01:54:32 2019 -0800" }, "message": "Add additional error conditions to MediaDrm\n\nNew codes are being added to handle resource\ncontention, lost session state, frame size too\nlarge and insufficient security level for\ndecryption. Also cleans up inconsistent use of\ntamper detected error where invalid state error\nshould have been used.\n\nbug:111504510\nbug:111505796\ntest:cts and gts media test cases\n\nChange-Id: I28ca04cdc8ce64047d189fcf4d59bab24208e1a7\n" }, { "commit": "b71be20f387c46ee31f855e12e62c80f5d35ed71", "tree": "022c30a1470a02d63ca2c9e2282373e3a84dec11", "parents": [ "c8baaba1ee057336c0f9293a1762befded9b5936" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Oct 23 11:33:42 2018 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Nov 08 12:18:55 2018 -0800" }, "message": "Update clearkey plugin to drm HAL v1.2\n\nThis CL implements the offline license management\nmethods in drm HAL v1.2.\n\nbug:110838441\nbug:117570956\nbug:116252891\n\ntest: android.media.cts.MediaDrmClearkeyTest#testOfflineKeyManagement\n\nChange-Id: I6db7c7f8a76aefb12358fd316041ffbc43239e6c\n" }, { "commit": "c895ed3083aa0ac37e5bc8ed89d3873f912a2184", "tree": "67d051c1b2eae7e29cec9cbbe0fa4f738eb648f8", "parents": [ "c76077c11fa86b3078eb60e0e8c3f234a651c16c" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Oct 31 11:31:04 2018 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Nov 01 18:49:01 2018 -0700" }, "message": "Add support for KEY_TYPE_RELEASE for clearkey plugin.\n\nTest: android.media.cts.MediaDrmClearkeyTest#testReleaseOfflineLicense\nTest: android.media.cts.MediaDrmClearkeyTest\n\nbug: 117617857\nChange-Id: I74b7db2824ca91f1301bba6404e4e900dde290d2\n" }, { "commit": "92f92de097b9d0bbd6a510edaec7b21b04a9268e", "tree": "afb579b858a14df13ac1f2a117960ce877792a65", "parents": [ "a1e48aa38987cd0460bbfc57e2b0fc513df17283" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Oct 11 12:00:30 2018 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Oct 11 17:38:23 2018 -0700" }, "message": "Add KEY_TYPE_OFFLINE support.\n\nClearkey now supports KeyType Streaming and Offline.\n\nTest: CTS test\n android.media.cts.MediaDrmClearkeyTest#testClearKeyPlaybackOfflineCenc\n android.media.cts.MediaDrmClearkeyTest\n\nTest: VTS tests\n adb shell /data/nativetest/VtsHalDrmV1_0TargetTest/VtsHalDrmV1_0TargetTest\n adb shell /data/nativetest/VtsHalDrmV1_1TargetTest/VtsHalDrmV1_1TargetTest\n\nbug: 38112718\nChange-Id: I34c788cd9457c6756de8bca1b3b22b9f1ff0655a\n" }, { "commit": "c7822ef90d1ddda3ef63b7d3c1a3498203e49568", "tree": "28bf4bedbf66432e7914ed0b357d4194b21eac7b", "parents": [ "5e0659c82240821cfa6766d33cca438a5f09ef32" ], "author": { "name": "Praveen Chavan", "email": "pchavan@codeaurora.org", "time": "Thu Oct 04 10:39:33 2018 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Oct 09 16:57:25 2018 -0700" }, "message": "Fix AMediaDrm_setPropertyByteArray\n\nAlso extend clearkey plugin to allow testing\nof this change.\n\nAuthor: Lubin Yin \u003clubiny@codeaurora.org\u003e\n\nChange-Id: Ie9b9fcd8920a6c843845700e7bba01ffc20a9507\n" }, { "commit": "ad02cc6c4091a44fb60c475731c8f4cac9a55ab0", "tree": "feb915fc8d4ab255bb8dc71985acd8df2f18f3b3", "parents": [ "15530ac49cc9af87ab0141e0875f23f8bd6b4264" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Aug 23 13:48:27 2018 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Aug 30 15:39:58 2018 -0700" }, "message": "Add onExpirationUpdate and onKeyStatusChange listeners.\n\nWe must only create one DrmListener instance.\nWe then process different listeners in DrmListener::notify.\n\nTo facilitate testing, we call the listeners from clearkey plugin\u0027s\nprovideKeyResponse function. We have previously tested\nEventType::VENDOR_DEFINED in the same manner.\n\nbug: 77712870\n\nTest: native CTS test testClearKeyPlaybackCenc\nTest: CTS MediaDrmMockTest\nChange-Id: Ie15e3012a4068824f72371a66e9fca2ee27180f8\n" }, { "commit": "1e935c739f40cb8247a1f13c02996aaa8331229b", "tree": "077345c5393a2a79d7798cbcdf274aa68ef23b1a", "parents": [ "694a72d3ef5f40aa06fb3b43f7bc52eeedd50fed" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Mar 28 11:46:57 2018 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat Mar 31 00:24:45 2018 +0000" }, "message": "Fix clearkey return code for setSecurityLevel\n\nWhen passing an invalid security level to\nDrmPlugin::setSecurityLevel, an incorrect error code\nwas being returned, based on the drm@1.1 DrmPlugin.hal\ndocumentation. This CL corrects the error code.\n\nChange-Id: If560be07f3945320d28c42cb2cf18d8f8c718229\nrelated-to-bug:73330999\nbug:77308498\nTest:VtsHalDrmV1_1Target\n" }, { "commit": "196f01061573d47096bcd2b6a7370f4f887c2444", "tree": "3e8aa9aa175661d7db1a5a7809d4d0c2bc6ed8d9", "parents": [ "d8c248902cd7f58d6fa909dd4adb24a0532aa577" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Feb 21 10:02:41 2018 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Mar 20 11:12:00 2018 -0700" }, "message": "Implements secure stops API for clearkey 1.1 service.\n\nTest: CTS tests\n run cts-dev --module CtsMediaTestCases -t android.media.cts.MediaDrmClearkeyTest#testSecureStop\n\nbug: 73085748\nChange-Id: Iec16df13f2827c782fd3a8f7ea6f8c94789c7fca\n" }, { "commit": "3ee1ea26592fe75a09d1847ae18190ffc60fc85e", "tree": "d3d9dfa666d920a31af69e4ddef57afd58270b29", "parents": [ "a9eaa7cdb4c426e2e84563b0bbb305ad8cfe7abc" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Feb 12 16:09:13 2018 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Feb 12 18:21:45 2018 -0800" }, "message": "Fix getKeyRequest_1_1 using 1.0 callback.\n\ngetKeyRequest_1_1 was using 1.0 callback.\n\nThis fix creates a common function for both 1.0 and 1.1\ngetKeyRequest to call. The function now calls the version\nappropriate callback to return key request data, key type\nand default url.\n\nTest: CTS ClearKeySystemTest#testClearKeyPlaybackCenc\nTest: CTS ClearKeySystemTest#testGetProperties\nTest: CTS ClearKeySystemTest#testSetProperties\nTest: Verify getKeyRequest_1_1 is called\n\nbug: 73085826\nChange-Id: Id70a92862473540f5a4eb815892a69dfe1601b92\n" }, { "commit": "41d279a7f3bc55a63b510d4dce07e18964cda152", "tree": "5d2c1f4a1ddabe93b57e6e3b0e616cab1f871645", "parents": [ "c23849a8ea5d7e2939e9d8a0aa8b6da9c08ee625" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sun Feb 11 19:52:08 2018 +0000" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sun Feb 11 12:51:19 2018 -0800" }, "message": "Revert \"Revert \"Fix MediaDrm security level APIs\"\"\n\nThis reverts commit 5f5e43fa83551a3636b92871bd2ad6b260a8815b.\n\nChange-Id: I72d585fd3768730eef6ad9effdbda81b32418dea\n" }, { "commit": "c23849a8ea5d7e2939e9d8a0aa8b6da9c08ee625", "tree": "c569b1e589dfb58fd73cc07c7824180770dcf55e", "parents": [ "4afda1eaee1c954b08177fb18fe755c370a6637e", "5f5e43fa83551a3636b92871bd2ad6b260a8815b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Feb 11 17:16:14 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Feb 11 17:16:14 2018 +0000" }, "message": "Merge \"Revert \"Fix MediaDrm security level APIs\"\"" }, { "commit": "5f5e43fa83551a3636b92871bd2ad6b260a8815b", "tree": "e6010dce1f091847db51b7464c566af774a98f74", "parents": [ "56134cc9e790f39b3b10a18b701b0607c20b6154" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Sun Feb 11 15:00:57 2018 +0000" }, "committer": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Sun Feb 11 15:04:10 2018 +0000" }, "message": "Revert \"Fix MediaDrm security level APIs\"\n\nThis reverts commit 56134cc9e790f39b3b10a18b701b0607c20b6154.\n\nReason for revert: Build cop here. The CL topic that I\u0027m reverting broke several builds: Drm.h\u0027s openSession(Vector\u003cuint8_t\u003e \u0026sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.\n\nhttps://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log\n\nChange-Id: I0de7738748ab793249df68bcbf18232d6a2d120a\n" }, { "commit": "fa84ada543c66b83e8328dc9bdf4982394fa4347", "tree": "05cb67d957ee0b3f7f193df6914b4d6aa487fb8b", "parents": [ "d0e0b1a1262c80e71fa2a1bb0f4880389b1e985b", "56134cc9e790f39b3b10a18b701b0607c20b6154" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Feb 10 03:28:04 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Feb 10 03:28:04 2018 +0000" }, "message": "Merge \"Fix MediaDrm security level APIs\"" }, { "commit": "7a03cef5489d8b1482415df75cba6c6242df4e10", "tree": "158b15948850cc363c406b66f0b60b51546b4d96", "parents": [ "1bfabb36f5d6f09d87e9d52778b5a1cca9512722" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Feb 06 21:02:25 2018 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Feb 06 21:09:16 2018 -0800" }, "message": "kVersionValue in clearkey service 1.1 should return 1.1.\n\nkVersionValue should return 1.1. Also change getPropertyString\nto get value from mStringProperties[] instead of using hard coded\nvalues.\n\nTest: CTS ClearKeySystemTest#testGetProperties\n\nbug: 73031837\nChange-Id: I9d108a42a75ac3685d2c6ef58697efffe6152284\n" }, { "commit": "56134cc9e790f39b3b10a18b701b0607c20b6154", "tree": "51d3279074ad852d1c8ce03cb5f2f024542f1267", "parents": [ "1bfabb36f5d6f09d87e9d52778b5a1cca9512722" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Feb 05 13:09:23 2018 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Feb 06 10:27:45 2018 -0800" }, "message": "Fix MediaDrm security level APIs\n\nVendors implementing the newly added MediaDrm.setSecurityLevel\nHAL found that it was difficult to implement properly. Also the\nsemantics are somewhat ambiguous from the Java platform API\nlevel. This CL binds the security level assignment to openSession\nwhich clarifies the API for apps as well as making it more\nnatural to implement in HAL modules.\n\nbug:72831697\nbug:64001680\n\ntest: VtsHalDrmV1_1TargetTest, GTS media tests\nChange-Id: Iaa07727be86ec2bc92be907d5a48c92136dc2014\n" }, { "commit": "27b25e1a9f4249633b56bc11bc311b0e6cd03102", "tree": "3330a979ad141c01db273288c2b2a2a52a96e68b", "parents": [ "a97e318d3fac9a47a7e0615473982f170148a52d" ], "author": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Wed Jan 31 18:27:51 2018 -0800" }, "committer": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Fri Feb 02 17:45:31 2018 -0800" }, "message": "Add getMetrics impl to ClearKey impl\n\nAdds an implementation of getMetrics to the ClearKey implementation.\n\nBUG: 69635855\n\nTest: VtsHalDrmV1_1TargetTest\nChange-Id: I3e01037081e8855e1dc9ff332c27edb8c79040df\n" }, { "commit": "1917fac1e41f57e547df7dcdebf57dd8483e7f61", "tree": "438e3c5dcb900dc9faec6be8a5bf3354bf38ca03", "parents": [ "c717e5e41ed866d3f156e15835150f898acba27d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 27 15:00:32 2017 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Feb 01 20:36:17 2018 +0000" }, "message": "Convert clearkey plugin to HIDL\n\nCreate clearkey HIDL service to support new APIs for drm 1.1 HAL.\nThe directories are organized into common, default and hidl.\nThe old shared library source is in common and default.\nThe new clearkey service source is in common and hidl.\n\nTest: VtsHalDrmV1_1TargetTest\n\nbug: 69635855\nChange-Id: I2e8e0e1a39b622aa274ecd32c873d81b95bdc4f8\n" }, { "commit": "6d998b67be330843f633a563c23c606593060165", "tree": "c9bfa7867b2610593e81ca8bf6d13b4b18501e14", "parents": [ "e18835269d8e875297603d889b3f928a13f93d6c" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Dec 18 14:37:43 2017 -0800" }, "committer": { "name": "Rahul Frias", "email": "rfrias@google.com", "time": "Mon Jan 22 01:29:32 2018 -0800" }, "message": "Implement new MediaDrm methods\n\nMethods for querying HDCP, security levels and\nnumber of sessions\n\nbug:64001680\nbug:33657579\n\nTest: cts: MediaDrmMockTest, ClearKeySystemTest\ngts: GtsMediaTestCases\n\nChange-Id: I7c84df02ec33d305b6bd5ac7479922f87aa64863\n" }, { "commit": "62137fd59d91b7492b2901536b1d81f92a81c412", "tree": "0d0bc60b4b73a987105b33e7c960066a125721e1", "parents": [ "dc68185aa25ba05951fdac50cac795bc0e09fc96" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Jan 04 15:55:13 2018 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Jan 04 16:34:20 2018 -0800" }, "message": "Partial revert of ag/3125606\n\nChanges to the clearkey plugin broke existing vts\ntests, and those tests can\u0027t be changed due to\nbackward compatibility requirements. This CL\nreverts the parts of ag/3125606 that caused the\ntest failures, while retaining most of those\nchanges.\n\nbug:70660219\n\nTest: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target\nChange-Id: Iab54b0917cc2e1edafc98bd97390bf9937b3d2ca\n" }, { "commit": "10869bee47fa5f9a2860bdfbc356f9cb163c83b9", "tree": "5ccf857314109555a756794a8c22c5537ef24b71", "parents": [ "bc9287260ccce3290308b4488d235d404b6a3ec5" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Oct 25 14:34:23 2017 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Nov 22 17:29:21 2017 -0800" }, "message": "Implement getPropertyByteArray and setPropertyByteArray.\n\nAlso move property strings into ClearKeyDrmProperties.h.\n\nTest: CTS\n ANDROID_BUILD_TOP\u003d ./android-cts/tools/cts-tradefed run cts -m\n CtsMediaTestCases --test android.media.cts.ClearKeySystemTest#testGetProperties\n\n ANDROID_BUILD_TOP\u003d ./android-cts/tools/cts-tradefed run cts -m\n CtsMediaTestCases --test android.media.cts.ClearKeySystemTest#testSetProperties\n\nbug: 68009146\nChange-Id: I95b68cf2c1f4ae0580e8f21a22daf0f0eb134a93\n" }, { "commit": "676e86e86d2f237b9120915feab23d23f458982e", "tree": "5fab532a29b61afff8607df72e5fe1fa391eba1e", "parents": [ "9a60e1ad4762bd428ddc158e5a50641649698ec4", "4996735560bab4f1cf1afa1144fc9378960f9d14" ], "author": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Wed Nov 01 19:24:41 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 01 19:24:41 2017 +0000" }, "message": "Merge \"Turn on integer sanitization in libdrmclearkey.\"" }, { "commit": "4a9ffdec3b3952dca4635b3d0e61a575eddb53d9", "tree": "41e3700628ef9dc5fc2f3440455611f7cba4cc43", "parents": [ "1a470463c6f7e55ff3794c0fd206895b12f6dfb3", "96e83fb2fe59f5f78307e9f7039c27acf7cc4fdd" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 19:03:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 19:03:58 2017 +0000" }, "message": "Validate decryption key length to decrypt function. am: 379b672b18 am: 66cbab1f13 am: 302d2e5cd4 am: ec57d22876 am: 5c338b682d am: 2616f56718 am: a74b3beb31 am: 36e2f9014a am: ea32ccad60 am: 3de1fd0a88 am: 0f8dbc6691 am: 30c05a8662\nam: 96e83fb2fe\n\nChange-Id: If0c874b0edce291321742a2b32e6b89a6ed6ffdc\n" }, { "commit": "96e83fb2fe59f5f78307e9f7039c27acf7cc4fdd", "tree": "b112f9da536b9ba84f1ff8dbc6e9708a440d8af5", "parents": [ "516a132ea87ec6a1251bfd825834bee141a1735f", "30c05a866298b1dc38a19e21bc813aca5af6b2e7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 18:43:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 18:43:49 2017 +0000" }, "message": "Validate decryption key length to decrypt function. am: 379b672b18 am: 66cbab1f13 am: 302d2e5cd4 am: ec57d22876 am: 5c338b682d am: 2616f56718 am: a74b3beb31 am: 36e2f9014a am: ea32ccad60 am: 3de1fd0a88 am: 0f8dbc6691\nam: 30c05a8662\n\nChange-Id: I1219c0cf91dc46da60a56da63e9662fcc5ed56d4\n" }, { "commit": "30c05a866298b1dc38a19e21bc813aca5af6b2e7", "tree": "4fe55cf810228eb3d2eb05a2c65c263532e11c66", "parents": [ "dc31a5d47cf4e2de82c622101e149db5e7f594a4", "0f8dbc66918ec03913527f05f9b642ae5c5fc1f4" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 18:33:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 18:33:10 2017 +0000" }, "message": "Validate decryption key length to decrypt function. am: 379b672b18 am: 66cbab1f13 am: 302d2e5cd4 am: ec57d22876 am: 5c338b682d am: 2616f56718 am: a74b3beb31 am: 36e2f9014a am: ea32ccad60 am: 3de1fd0a88\nam: 0f8dbc6691\n\nChange-Id: I36e0964a83beedba69d047e0ecc17ff514cc42f1\n" }, { "commit": "0f8dbc66918ec03913527f05f9b642ae5c5fc1f4", "tree": "d88ed8b92cedae2b01c80984fb3c503e0fcbfe7f", "parents": [ "21076bf34eb928eff1ce1f2526a0a291c7ba96ba", "3de1fd0a88dd7ef6527166f3600dbab8aa79b937" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 18:19:07 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 18:19:07 2017 +0000" }, "message": "Validate decryption key length to decrypt function. am: 379b672b18 am: 66cbab1f13 am: 302d2e5cd4 am: ec57d22876 am: 5c338b682d am: 2616f56718 am: a74b3beb31 am: 36e2f9014a am: ea32ccad60\nam: 3de1fd0a88\n\nChange-Id: Ia3c31b0e0ff87b9cd65bba235e29ab077b835570\n" }, { "commit": "3de1fd0a88dd7ef6527166f3600dbab8aa79b937", "tree": "782b59483bb683c7bd383ab28615525ea4d03489", "parents": [ "29e2a05752c306af46d49b4f0289342d7183bc88", "ea32ccad60f40a4ec30fe783157865028e24878e" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 18:05:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 18:05:45 2017 +0000" }, "message": "Validate decryption key length to decrypt function. am: 379b672b18 am: 66cbab1f13 am: 302d2e5cd4 am: ec57d22876 am: 5c338b682d am: 2616f56718 am: a74b3beb31 am: 36e2f9014a\nam: ea32ccad60\n\nChange-Id: Ic1e2fbb0dec87d8b7ea7ca566fc801878cbb4502\n" }, { "commit": "36e2f9014a31bab089a4b7f8da4c5f5fc3c1adc2", "tree": "f78c1a7d94587c1ef15d953588ea837fde986771", "parents": [ "abb3de9fd5ecf70f79f6fe0105cb717c094c6cda", "a74b3beb31d467e8d7bd0927d40f3c0ef29abe69" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 17:26:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 17:26:08 2017 +0000" }, "message": "Validate decryption key length to decrypt function. am: 379b672b18 am: 66cbab1f13 am: 302d2e5cd4 am: ec57d22876 am: 5c338b682d am: 2616f56718\nam: a74b3beb31\n\nChange-Id: I73bcdc9097b2146d674a7de46b16d18381b32fd2\n" }, { "commit": "2616f5671808764efa9f9812085cd2867dd2ef78", "tree": "7d1490d0ee17f27cf54adf9de9d30574b3316ae7", "parents": [ "d1c3cd5c2ab0da0a0ec317f2f49a9db1f27827d9", "5c338b682dd671d12aeb9cc6fac52e1361b8a635" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 17:01:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 17:01:00 2017 +0000" }, "message": "Validate decryption key length to decrypt function. am: 379b672b18 am: 66cbab1f13 am: 302d2e5cd4 am: ec57d22876\nam: 5c338b682d\n\nChange-Id: Ic438d5d780295127e386524bc7457dc0669f113c\n" }, { "commit": "66cbab1f138818bdecbaffc08e6808d9939219aa", "tree": "a3ef14a04d5c7531b0443e6051c24ee2ad309a88", "parents": [ "ab486b087e4200554662552bd94f2424a00af6eb", "379b672b189aa72ce0103b485019022f3e292c36" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 16:33:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 16:33:45 2017 +0000" }, "message": "Validate decryption key length to decrypt function.\nam: 379b672b18\n\nChange-Id: Id02cc53d3b7d561f64893391a6160520e5e89593\n" }, { "commit": "379b672b189aa72ce0103b485019022f3e292c36", "tree": "4d0deec56026e92cdc48064075964bc5c0b4bccc", "parents": [ "1da4542abd654d91d78926c5455aa3117986acb5" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Oct 06 18:21:06 2017 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Oct 30 15:58:05 2017 -0700" }, "message": "Validate decryption key length to decrypt function.\n\nCherry picked from http://go/ag/3038278.\n\nAesCtrDecryptor::decrypt() doesn\u0027t check whether the size of \"key\"\nis equal to 16 bytes, which may lead to an OOB read problem in the\ncontext of mediadrmserver.\n\nAdd DecryptsWithEmptyKey and DecryptsWithKeyTooLong unit tests.\n\nTest: ClearKeyDrmUnitTest\n adb shell LD_LIBRARY_PATH\u003d\"/vendor/lib/mediadrm\"\n /data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest\n\nbug: 63982768\nChange-Id: I1f22c9df2b051972b2c532608b7f203e3ce77926\n" }, { "commit": "4996735560bab4f1cf1afa1144fc9378960f9d14", "tree": "3853de7fb3d3fd81fbe696ae167418c8e7eba4a3", "parents": [ "ad764cd0e198a0ede404c53e2da5fd38ecb1e049" ], "author": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Mon Oct 16 14:21:27 2017 -0700" }, "committer": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Mon Oct 30 12:17:11 2017 -0700" }, "message": "Turn on integer sanitization in libdrmclearkey.\n\nThis turns on signed and unsigned integer overflow sanitization in the\nlibdrmclearkey library.\n\nBug: 67706062\nBug: 62343822\nTest: Ran CtsMediaTestCases and CtsDrmMediaCases\nChange-Id: If74850fe73f2cca13ad27d58458d559dd26953ee\n" }, { "commit": "90f704352e8a4f10ed0afa37dedffdfc9f45b484", "tree": "ef50c186f66b37b8de9cd3cddfd58b61f716e3f7", "parents": [ "ebb1815e05baf716ca7d7ca085a9088054559f33", "11ebad3460e8199ff2772e8124af255a9c702a2f" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Oct 20 19:30:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 19:30:17 2017 +0000" }, "message": "Merge \"Use -Werror in frameworks/av\" am: cf8437acd9 am: d9c907b8fd\nam: 11ebad3460\n\nChange-Id: I73d01bf0a10d55ce7cf5c76e4a21533565e81f0e\n" }, { "commit": "5cf0751390afa26b8fefacbf43541d7d4cffc1a5", "tree": "b23cb5a877f17f7378e6f98ee906e0f55091b52c", "parents": [ "16f2c1559c5722a6cd69fef3c17dc5756ba73fe6" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon Oct 02 13:59:12 2017 -0700" }, "committer": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Oct 20 19:19:00 2017 +0000" }, "message": "Use -Werror in frameworks/av\n\n* Suppress unused-variable warnings.\n\nBug: 66996870\nTest: build with WITH_TIDY\u003d1\nExempt-From-Owner-Approval: already had multiple +2 votes\nChange-Id: I985f9328684df501b5934a5c01f783ed7ca5aa0c\n" }, { "commit": "872011203ea90a0a15fcdcf4474e19d735206b37", "tree": "d1a48e12529926c3afd7e83bae067423b65bbf68", "parents": [ "7966b4412671e573e32127fbbd272f94a9cc1fe8", "815c9259d86b862c298db44d1a7f4f3c6a3b1dcd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 07 18:39:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 07 18:39:44 2017 +0000" }, "message": "Merge \"Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair.\" into oc-mr1-dev" }, { "commit": "815c9259d86b862c298db44d1a7f4f3c6a3b1dcd", "tree": "2edb860d4f8dc46a26cf0a81dd5b80ab07b293ff", "parents": [ "faf18c58baf4db501c9707a30fd811a4c9386a26" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Aug 30 17:47:20 2017 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Sep 07 02:53:54 2017 +0000" }, "message": "Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair.\n\nImplement queryKeyStatus in Clearkey plugin for testing.\n\nAdd CTS testQueryKeyStatus in ClearKeySystemTest and\nNativeClearKeySystemTest in a separate CL.\n\nTest: CTS - ClearSystemTests\n ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m\n CtsMediaTestCases --test android.media.cts.ClearKeySystemTest\n\nTest: CTS - NativeClearSystemTests\n ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m\n CtsMediaTestCases --test android.media.cts.NativeClearKeySystemTest\n\nbug: 64938501\nChange-Id: I8371a3b871e90762f1e7c8453dd6002c31f7eb13\n" }, { "commit": "144865c5dd27ea8f8662864e25ddddf9ec390c37", "tree": "834cfda11ed4a8ce7111f51f897df2b5ba8627c5", "parents": [ "69545369eef7dcaf81b889a2fc216ec7923c9622" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Jun 22 17:11:15 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Sep 06 15:04:38 2017 -0700" }, "message": "Use vendor variant of libstagefright_foundation.\n\nRather than having a lib called libstagefright_foundation and one\ncalled libstagefright_foundation_vendor, we now just have one library\nand the build system keeps track of the vendor APIs that are exposed.\n\nTest: (sanity) boot device, watch (part of) DRM protected movie.\nChange-Id: I49f1c557ae8f93092bad5314e0630583cc7dc710\nMerged-In: I49f1c557ae8f93092bad5314e0630583cc7dc710\n" }, { "commit": "999782fa3ff94607c0a814c8d447fad38c2c4c57", "tree": "53cf6dc92820db237ab0cc8b183ac9cd78cfb465", "parents": [ "faf18c58baf4db501c9707a30fd811a4c9386a26" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Aug 16 18:56:04 2017 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Aug 31 01:08:05 2017 +0000" }, "message": "Fix ClearKey Drm base64 en/decoding to use base64url.\n\nClearKey\u0027s base64 en/decoding should use \u0027-\u0027 and \u0027_\u0027\ninstead of \u0027+\u0027 and \u0027/\u0027 (web safe coding). Add support\nfor base64url coding in libstagefright foundation library\nand update ClearKey plugins.\n\nTest: CTS - ClearSystemTests\n ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m\n CtsMediaTestCases --test android.media.cts.ClearKeySystemTest\n\nTest: CTS - NativeClearSystemTests\n ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m\n CtsMediaTestCases --test android.media.cts.NativeClearKeySystemTest\n\nTest: libstagefright/foundation/tests/Base64_test\n adb shell /data/nativetest64/sf_foundation_test/sf_foundation_test\n\nTest: ClearKeyDrmUnitTest\n adb shell LD_LIBRARY_PATH\u003d\"/vendor/lib/mediadrm\"\n /data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest\n\nTest: Vts\n vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target\n --primary-abi-only -l VERBOSE\n\nbug: 64388098\nChange-Id: Ic08515fd491f15e088600c64603149401c117f4a\n" }, { "commit": "d8d7bf6128253b740bd6515e2371f5f74c5ccea8", "tree": "6be7e3ef68c036675ea94327d3478fbab517928d", "parents": [ "932a77919784b16533588884b8044668813f2828" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Aug 08 15:49:47 2017 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Aug 08 15:49:47 2017 -0700" }, "message": "Support both Clear key plugin UUIDs.\n\nTest: VTS - VtsHalDrmV1_0TargetTest\n\nTest: CTS - ClearKeySystemTests and NativeClearKeySystemTests\n\nbug: 64386897\nChange-Id: I8ca81cd4c69f830c5d38e71a2f3f7879a8d3b75f\n" }, { "commit": "8cc8de2962a4203fa4ecd7f8a0a9744d0aeb7489", "tree": "961ab7723b9a0b5987131b59d2792e5f45e3b9c9", "parents": [ "6c3359f522fa5c528d7eef5deaaf0d2c9c365089" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jul 17 12:42:42 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jul 17 12:42:42 2017 -0700" }, "message": "Make ClearKeyDrmUnitTest build with the VNDK.\n\nWhen the vndk is enabled (BOARD_VNDK_VERSION\u003dcurrent),\nvendor libraries must only link against vendor variants\nin the build system. This also means that they receive\nrestricted sets of headers and that automatic global\nheaders are restricted.\n\nTest: build ClearKeyDrmUnitTest with BOARD_VNDK_VERSION\u003dcurrent\nBug: 37342627\nChange-Id: I5e95a19700522d3ec03e457d6779a34e9be99139\n" }, { "commit": "f0ee3c62f441031ac6c7fe3abb98a67b6e064cf9", "tree": "433a7612bca18d4039e085dd7eeb521828f3b68c", "parents": [ "b64230e6f42e87a84725d9934d9e25c638d761b1" ], "author": { "name": "Tri Vo", "email": "trong@google.com", "time": "Tue Jul 11 17:48:31 2017 -0700" }, "committer": { "name": "Tri Vo", "email": "trong@google.com", "time": "Tue Jul 11 17:48:37 2017 -0700" }, "message": "Build libmockdrmcryptoplugin with VNDK.\n\nBug: 37342627\nTest: BOARD_VNDK_VERSION\u003dcurrent m -j64 libmockdrmcryptoplugin\nChange-Id: Ided0ce365e0f13b9c4772c99508e253fa627f0be\n" }, { "commit": "cb316c7ecc5520aa861f26e6f52114e5e5e9a902", "tree": "276692b539e846bd8e990090bc6a8dcac3296306", "parents": [ "f0ba75d52621fdd744d021cb78127ba07f89f7fe" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Jun 22 17:11:15 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jun 23 08:49:02 2017 -0700" }, "message": "Use vendor variant of libstagefright_foundation.\n\nRather than having a lib called libstagefright_foundation and one\ncalled libstagefright_foundation_vendor, we now just have one library\nand the build system keeps track of the vendor APIs that are exposed.\n\nTest: (sanity) boot device, watch (part of) DRM protected movie.\nChange-Id: I49f1c557ae8f93092bad5314e0630583cc7dc710\n" }, { "commit": "bd5609f0a3fd6cfc6adb88472ca1d37eb325855d", "tree": "f6c43978272b8b917117a88129b66597e6d41f46", "parents": [ "4c86beec4601907a84db4a704f40e0d879d7de84", "89f1f99d646fc6fbe72edc0d3f48d628543dd841" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Jun 20 10:50:09 2017 +0900" }, "committer": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Jun 20 13:29:50 2017 +0900" }, "message": "DO NOT MERGE: Merge commit \u002789f1f99d646fc6fbe72edc0d3f48d628543dd841\u0027 into manual_merge_89f1f99d64\n\nMerged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88\nChange-Id: Iac8c115a9e2195cd2df1ba507985e5f663587502\n" }, { "commit": "b719ae6523c43e865c2d95de1cf3c248397c1ec7", "tree": "f380f4a2147dcb97c769818a6f7cc10147e64115", "parents": [ "3c1ba2cd6276ee4304ba082fbe40fd870c1746c8" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Fri May 26 11:45:08 2017 +0900" }, "committer": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Thu Jun 15 01:40:13 2017 +0000" }, "message": "libdrmclearkeyplugin is linked against libstagefright_foundation_vendor\n\nSince libdrmclearkeyplugin is in vendor partition, it is linked against\nthe vendor-variant of the libstagefright_foundation.\n\nBug: 37343126\nTest: sailfish builds and boots\nTest: BOARD_VNDK_CURRENT\u003dcurrent m libdrmclearkeyplugin is successful\nMerged-Id: Id8302f88978fc91282c54e0a679bcd8978898f8d\nChange-Id: Id8302f88978fc91282c54e0a679bcd8978898f8d\n(cherry picked from commit 24aa2adf677c71cc8f3c519ce83f4cf3363e640f)\n" }, { "commit": "54fabe00cd8c76bdca643a4c3efb4c647ca25513", "tree": "cac016f71a16c00e93341bd098b29a19d879725b", "parents": [ "6d72a93317998951b2fd15072f30200466aa79ad" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Fri May 26 11:45:08 2017 +0900" }, "committer": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Jun 14 18:00:23 2017 +0900" }, "message": "libdrmclearkeyplugin is linked against libstagefright_foundation_vendor\n\nSince libdrmclearkeyplugin is in vendor partition, it is linked against\nthe vendor-variant of the libstagefright_foundation.\n\nBug: 37343126\nTest: sailfish builds and boots\nTest: BOARD_VNDK_CURRENT\u003dcurrent m libdrmclearkeyplugin is successful\n\nMerged-In: Id8302f88978fc91282c54e0a679bcd8978898f8d\nChange-Id: Id8302f88978fc91282c54e0a679bcd8978898f8d\n(cherry picked from commit 24aa2adf677c71cc8f3c519ce83f4cf3363e640f)\n" }, { "commit": "c860da3ee1250b3316fcec4d868394a7263caadb", "tree": "c3e551f8f7ab90e96f9ba0b16ccc09a158df319d", "parents": [ "76f3c913d1818652517955c74bec100f2cb915b9", "d499a9c6d1e71d2d71fe80383515c4ea9fded5ca" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 20:15:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 20:15:16 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0 am: 1ce2364aa0 am: 83cf30ec83\nam: d499a9c6d1\n\nChange-Id: Ia2b649da3e000f8b6ce787230343fa4d5cda747e\n" }, { "commit": "414ff6e202a170c8f6922ac6dc5416dee26bf23b", "tree": "73266f70d6524de6be7fa5ef9fe43bb5c40faf26", "parents": [ "94e16458f4665d3c167d0e2c905a3f4ec9e7a3e7", "83cf30ec83bccc27ca1204dc2afed54e2ca401cc" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 20:09:14 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 20:09:14 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0 am: 1ce2364aa0\nam: 83cf30ec83\n\nChange-Id: I4954f32655f51392a85d60e95e7837f64deee05d\n" }, { "commit": "d499a9c6d1e71d2d71fe80383515c4ea9fded5ca", "tree": "e2b47698390db0812f15a2be5bd9deaa09c676c7", "parents": [ "d25a99c4c69095ca5488e5da625c498d0dd118c0", "83cf30ec83bccc27ca1204dc2afed54e2ca401cc" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 20:09:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 20:09:13 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0 am: 1ce2364aa0\nam: 83cf30ec83\n\nChange-Id: I1117a9d5d6b085d60bb8dd493e9c3c6514a114e2\n" }, { "commit": "83cf30ec83bccc27ca1204dc2afed54e2ca401cc", "tree": "2d77244f3a11fa654c00a0a6f556b851a7ab8453", "parents": [ "506107eb78fba558a4a94a2230ed1a67d4b7623c", "1ce2364aa0b8115f91129983afda449fcabd46e9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 20:03:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 20:03:13 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0\nam: 1ce2364aa0\n\nChange-Id: I408469564b54bb9dc393ab955236406c1c01f22e\n" }, { "commit": "8d214cd0b0b667b30b3f0f6021fcb5d7d95553d0", "tree": "04b405762548a52eac14b73c313fe97a42634cba", "parents": [ "7994267b2afe6f4d9eac15f2ad067e7ac2fef4da", "87e076681bbf79ae6dd6471cca8cb5661e3f0cc0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:51:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:51:41 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551\nam: 87e076681b\n\nChange-Id: I2d9124f3aa6a0ed072708c4c6a7e37f061a0a089\n" }, { "commit": "a64aff4551184706e379c14346c263df06b640e9", "tree": "cc7f61137e232353dba76bcf172210d6a4fb96c9", "parents": [ "425c7a42fb1a99e1b2f13c398b9fde555cd4c499", "fdfb9d206d2d8e5c58c3175064bff33ce562cbc6" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:39:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:39:40 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082\nam: fdfb9d206d\n\nChange-Id: I09b988c8906ccbabd7bc970d6a0be117e8b4b1df\n" }, { "commit": "7a22df06c3aea406dee1b8f31842001d89f2e6d6", "tree": "5bc7ce5d297353819a9854505b2c8384b290666a", "parents": [ "98a47295222edacfca74fcfd3310922e16224f6d", "d1a854a073f6c992fabac1fc79f7f3c002699491" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:16:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:16:09 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec\nam: d1a854a073\n\nChange-Id: I212669c64a748fed506b8b4a90a568aa91d01787\n" }, { "commit": "5250bc1becd741d06c534fdabb19227090e6523e", "tree": "89366462323c9d3b757ea69991ded18954c606fc", "parents": [ "8ff995a8ae93d19cf7bfa85844ed321de1a403eb", "eb21712f81aa9f6d5b055113595220ee1506f35c" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:05:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:05:36 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver\nam: eb21712f81\n\nChange-Id: I0caf94590f85f444a4705f62792c27a447fa8b69\n" }, { "commit": "eb21712f81aa9f6d5b055113595220ee1506f35c", "tree": "8b7680cf16eac5079c70089c03ba95e93874ae03", "parents": [ "cbaad4b189c8566318bdb148cf905fe2b333b8ed" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jun 05 14:34:48 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jun 05 14:34:48 2017 -0700" }, "message": "Fix integer overflow in mediadrmserver\n\nbug:37710346\nChange-Id: If18cfb5bb1d1f1b2997d2a0e1685590d674181f4\n" }, { "commit": "cbe95e7697039f59d378fd1b9b61cee64fad8742", "tree": "ddecf30ecc683659e4ac3072bd94a106402d730c", "parents": [ "11ed3fecdf3b5d97cc8390b32b5319bae4e901e1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 28 16:43:52 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 05 13:14:18 2017 -0700" }, "message": "Use %zu to print size_t\n\nTest: m -j checkbuild\nChange-Id: I93a1da7241169e0e08d310ad7fad68f227629be6\nMerged-In: I93a1da7241169e0e08d310ad7fad68f227629be6\n(cherry picked from commit cb8f367327286714617c0ccd7b356abd3a8aa15b)\n" }, { "commit": "cd3b59c8ba5da18eb4f501b62f4e583027bc3e9d", "tree": "77afa24be47b0dacaff465c9676a3a925c4681df", "parents": [ "f9ef332d4f3780b8256bdf7542219970fa95e578", "ed05809fcb4623f6aa5c4bf2891e7037cb2831be" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu May 04 21:10:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 04 21:10:38 2017 +0000" }, "message": "Merge \"Convert libdrmframework and drmserver to Android.bp\" am: a33999bab9 am: 5eb26eebfb\nam: ed05809fcb\n\nChange-Id: I112374bce87c4905eddb4883f7aad95d32b429c8\n" }, { "commit": "61d1c58c90e2491dd710688946f2a2cb2f42b837", "tree": "b35636371f06d1bd3ef1fbfd4a29fd2b8857ff90", "parents": [ "8c9f6f743755310e825b39afcb5f3cb7198dc1d8" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 28 15:13:07 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed May 03 19:55:23 2017 -0700" }, "message": "Convert libdrmframework and drmserver to Android.bp\n\nSee build/soong/README.md for more information.\n\nAlso moves a few headers into the same library as their\nimplementation, and fixes a few includes to go through the\nglobal frameworks/av/include path instead of manually adding\nframeworks/av/include/drm.\n\nTest: m -j checkbuild\nChange-Id: I0c2d2f2262e7ed78d80a0d44795705c64b797ff0\n" }, { "commit": "4f79e5a8d8e3c78a64b7b98557799ce70ec7b19a", "tree": "9427197e2bb92766cbb659425a48b2e1b29a244b", "parents": [ "5d4a63d87137d9cbf532d4756283703ed95707c9" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 28 16:43:52 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 02 21:52:10 2017 +0000" }, "message": "Use %zu to print size_t\n\nTest: m -j checkbuild\nChange-Id: I93a1da7241169e0e08d310ad7fad68f227629be6\n(cherry picked from commit cb8f367327286714617c0ccd7b356abd3a8aa15b)\n" }, { "commit": "1c2c96a5c2ae8dbc80b57323afd25336917b7e39", "tree": "34a44f76b66ce192d47a090e2fe43582d2a36840", "parents": [ "d5c9b80333415a78de5c87591dc5e014598c31e2", "ad866fd08bf8490b807ffed7bdcbd0e86b30e9be" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Fri Apr 28 22:51:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 28 22:51:13 2017 +0000" }, "message": "Merge \"MockDrmCryptoPlugin: Don\u0027t truncate log output\" am: 0e0e0819bd am: 3d065314ad\nam: ad866fd08b\n\nChange-Id: Ic0cc856a688b5d2e879e167ae018b574e692c0c1\n" }, { "commit": "0fe7807867001217e590d5eabf114c162438a819", "tree": "86a7783af14f80aa979e32f2bfcbffc42c8e3c52", "parents": [ "c11caab96fb7a91a842c36260fb92b4f3d452b60" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Apr 25 15:12:07 2017 -0700" }, "committer": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Fri Apr 28 10:27:45 2017 -0700" }, "message": "MockDrmCryptoPlugin: Don\u0027t truncate log output\n\nA function argument which is an array with a fixed size is not\nactually a fixed size array, but rather just a pointer. Thus,\nwhen we were using sizeof() for \u0027key\u0027 and \u0027iv\u0027, we were mostly\nlikely only logging the first 4 or 8 bytes of the array, and\nnot all 16.\n\nWe change this code so we\u0027re at least passing the correct size\nto the arrayToString method, and thus logging all the bytes.\n\nThis API is still fragile, as there is nothing which assures\ncallers to decrypt are passing in arrays which are exactly 16\nbytes. However, this API is equivalent to before, so we aren\u0027t\nintroducing any compatibility issues.\n\nThe compiler gave a warning about this.\n\nTest: Compiled and confirmed there\u0027s no longer this compiler warning.\nChange-Id: Ie3a32eef0882ea95bccc3e22ffcab7336779bd4c\n" }, { "commit": "46da191f228293adacbba447233e7e6e2dcdbcca", "tree": "abf4822f2f133d09cc94b3efeff99729f25a9f85", "parents": [ "464d9fbf52f37b2ec465acad65c6342aa35db457", "7268713681d6bb79f6aacff68a0630833278f2f2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Apr 06 18:20:58 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Apr 06 18:20:59 2017 +0000" }, "message": "Merge \"Add additional checks for invalid parameters\" into oc-dev" }, { "commit": "7268713681d6bb79f6aacff68a0630833278f2f2", "tree": "2b0be2c2d1022fbab9265517e932f0b7b05276de", "parents": [ "f3134a01aa2574f8ab62f58f1a76b77029201196" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 04 22:03:44 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Apr 06 06:24:59 2017 +0000" }, "message": "Add additional checks for invalid parameters\n\nThe clearkey plugin didn\u0027t handle some cases of\ninvalid parameters, which was found the drm VTS test.\n\nTest: drm vts test passes\n\nbug:34178477\nChange-Id: I4643e099f052169d6950db8002b13711b56f30f5\n" }, { "commit": "ffbe644a25052c7ccd394486c557d2130335ee45", "tree": "3d8fd9aee79df1c46040f1bc65b7287bb23f5609", "parents": [ "eb12e8bd16208fdd3017e2d99fee721993efdaa4" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Mar 29 20:42:37 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Mar 30 23:02:19 2017 +0000" }, "message": "Clearkey plugin didn\u0027t handle negative test cases\n\nPart of VTS tests for drm\n\nChange-Id: Ia89aa51ec9018e633fd8b04bfeceb5fe4e631daa\nrelated-to-bug: 32815560\n" }, { "commit": "d76b8b5877a9c29bcf2385a1f7bfdf4043e398a0", "tree": "e2e13eeec766580ae77a59cfd7f769f8c77bd842", "parents": [ "832fcce0c4bdc748bc4cb75101615e77769ec4e8" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Mar 06 17:29:15 2017 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Mar 06 18:54:27 2017 -0800" }, "message": "Prevent findSession from creating new sessions\n\nfindSession in the SessionLibrary wasn\u0027t detecting\nthe case of a sessionId not found. Since\nDefaultKeyedVector was used, a new session id would\nget created instead of returning a null sp.\n\nTest: drm hidl hal vts test\n\nbug:36006836\nChange-Id: Iff00d8b84188d2bf9f26bceccf645bb730076378\n" }, { "commit": "68b3d9f49e68a11af5225175dc9e60ce88819e84", "tree": "750d8fe493c2ec45542968192ecfe52d83133a02", "parents": [ "9b088162cb9cdeb542f106a45d06a1f802e91e6e" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Jan 06 19:07:54 2017 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Jan 30 15:26:51 2017 -0800" }, "message": "Pass application packagename to drm plugin.\n\nPass application package name to createPlugin and createDrmPlugin.\nThe application packagename will be used as part of a unique\nidentifier for drm plugin.\n\nTest: Play Movies.\n\nTest: ANDROID_BUILD_TOP\u003d ./android-gts/tools/gts-tradefed run gts -m\nGtsMediaTestCases --test\ncom.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P60\n\nVerify the application\u0027s packagename is reachable in the drm plugin\u0027s\ndebug log.\n\nbug: 27101531\n\nChange-Id: I84fb09b591a7af63f6e20004e910112a4ce6ebac\n" }, { "commit": "8a0470a12759dd77b73346c7caf11de8318c6d3c", "tree": "6b37c76186b1dfe7b1709d8023142d89b20609a7", "parents": [ "03489bde8bf2cd4ba3ae4c982323ceb40d92e3f4", "58a795ba810a929eb8d5f81502041f101c263bd2" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Sat Dec 10 00:39:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Dec 10 00:39:56 2016 +0000" }, "message": "provideKeyResponse to send an event to test AMediaDrm_setOnEventListener.\nam: 58a795ba81\n\nChange-Id: I36549dfe68546f0db60e841caa6c49c861095d9f\n" }, { "commit": "58a795ba810a929eb8d5f81502041f101c263bd2", "tree": "b8a1dc36322302054793399ff92392f7af3ed22f", "parents": [ "83cb42836108742727ba8fc0bf24ab832001d687" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Nov 15 18:39:51 2016 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Sun Dec 04 03:42:19 2016 +0000" }, "message": "provideKeyResponse to send an event to test AMediaDrm_setOnEventListener.\n\nThe drm plugin provides a listener, we send a kDrmPluginEventVendorDefined\nif provideKeyResponse succeeds.\n\nThe reason for sending kDrmPluginEventVendorDefined is because\nkDrmPluginEventKeysChange currently does not have ndk api support.\n\nThis addition is intended for testing AMediaDrm_setOnEventListener only.\n\nTest: cherrypick go/ag/1598039 and go/ag/1630324\n\nANDROID_BUILD_TOP\u003d ./android-cts/tools/cts-tradefed run cts -m CtsMediaTestCases --test android.media.cts.NativeClearKeySystemTest#testClearKeyPlaybackCenc\n\nTest passes and look for \"EVENT_VENDOR_DEFINED received\" in the debug log.\n\nbug: 32648208\nChange-Id: Iec98b856e8d4ce888f8a1cd2568a3dee871effc5\n" }, { "commit": "95ec4e074264966eac7ca04fc638a867d41b490d", "tree": "0daa095248c9b30965864d8935120b2fd78b64ba", "parents": [ "784ccb3cdd169c4de33188621cb9691663312266", "af786a3f97993edb43e64ac8655d47b11bef4375" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 14 20:06:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 14 20:06:30 2016 +0000" }, "message": "Fix AMediaDrm_getKeyRequest which fails clearkey InitDataParser::parse test. am: 01a977aa75\nam: af786a3f97\n\nChange-Id: I2b4ac15bfaa5edf69c9ca12eccfb64df761e63fd\n" }, { "commit": "01a977aa75c296c5467024a7beac50cbd4ed0335", "tree": "f8026c924aa6f15b1ae1f2d7c88564f5dd7a3ecf", "parents": [ "790a227cecca77f00e954e9bf28e7015c8bf50ff" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Aug 11 14:06:34 2016 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Aug 29 22:58:59 2016 +0000" }, "message": "Fix AMediaDrm_getKeyRequest which fails clearkey InitDataParser::parse test.\n\nAMediaDrm_getKeyRequest() passes mimeType to drm plugin\u0027s getKeyRequest()\nbased on the UUID. If the drm scheme is clearkey UUID, clearkey plugin will\nreturn ERROR_DRM_CANNOT_HANDLE because it is expecting initDataType\n(e.g. \"cenc\") instead of mimeType (e.g. \"video/mp4\").\n\nReplace initDataType parameter in clearkey DrmPlugin::getKeyRequest() with\nmimeType.\n\nbug: 30790899\nChange-Id: I60c77c458d8d836d3eb2f9f52296a86efa73a4eb\n" }, { "commit": "aee0669a7bdc1502a5e3d0752aaf84b0354a005e", "tree": "84807a87c619574cbdb755f434735aaacb131492", "parents": [ "df76b9605008434bb1fd520c8affe4fa3955e981", "e05551983910801c4bf3c157a000246e26713609" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Aug 09 23:35:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 09 23:35:06 2016 +0000" }, "message": "Merge \"Fix clang-tidy warnings in drm.\"\nam: e055519839\n\nChange-Id: I99159fb0391af796445ea24265d088d20d178077\n" }, { "commit": "8c0164ca98bcc76f3656fb1078033bffd4a387de", "tree": "053055dfa80eb72f140b8ce6da9fb138f2e6486d", "parents": [ "67fbddfdc2cafd63c83d3bb55a2451d4c26f546d" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Aug 09 14:20:59 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Aug 09 14:20:59 2016 -0700" }, "message": "Fix clang-tidy warnings in drm.\n\n* Add explicit keyword to conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\n* Use const reference type to avoid unnecessary copy.\nBug: 30413862\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: Idf1c48d7bfe3f0da20401cb3ff1983ec00be170d\n" }, { "commit": "b2231171d83c196dbb97aaa2563fa142e33a91c6", "tree": "0f07c3a4ca9221b7b35eaaac407b8b494d93fec5", "parents": [ "9129c06770340395fe88d08e586b599b8e2a44f9" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Fri Feb 12 16:57:08 2016 -0800" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Fri Feb 12 16:57:08 2016 -0800" }, "message": "Fix more unused parameter warnings in frameworks/av/drm.\n\nBug: 27151704\nChange-Id: Id153f12623b5d9d447f3f0605c30caf8743c367c\n" }, { "commit": "18cb1eca504817b5b144a023ae2792d90e74c9a5", "tree": "4b39e8a99696709fb6d1c8197328f073cb21f66a", "parents": [ "1ab2f2d0a6208ec9b6bb7e8b130efa9b70737f98" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 18 11:55:22 2015 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jan 11 17:01:07 2016 -0800" }, "message": "Support AES-CBC sample encryption in MediaDrm\n\nbug:23719082\nChange-Id: I3028452f315122b65296881aed1fbf66c3ceeebc\n" }, { "commit": "6ca0256a1dcd85e1fa0a535347a9f0ecc57e284d", "tree": "b4cbf5a35c31dc157921709fe45393580299f5d4", "parents": [ "5be2304ab2a1e40ca85f2c01defa4bb33e8344d9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 09 08:40:40 2015 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 09 08:40:40 2015 -0800" }, "message": "Remove unused MediaDrm.unprovisionDevice\n\nbug:25726218\nChange-Id: I6eb0ceb488c66c191897b3c190f5da1d71880c77\n" }, { "commit": "9472e5f3ab44f04c92e44ad0f3e94c0ee508ec11", "tree": "310e52bec409cfbdfcc355f67c03e792c51df347", "parents": [ "2d6b6601743c3c6960c6511a2cb774ef902759f4" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 29 16:35:28 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jun 03 11:35:50 2015 -0700" }, "message": "Implement MediaCrypto.setMediaDrmSession in clearkey plugin\n\nTo support adding cts tests for new APIs in M, the\nclearkey DRM plugin needs to be updated.\n\nChange-Id: If672ecec8f570d1dd5130e8e4419d37bd931a9e2\nrelated-to-bug: 21527003\n" }, { "commit": "2fb25c873e1a7f346bd8c7c072a85ca6a74b0e95", "tree": "d087aa2f16546cc08efaaf756d446cf27f6bd9d1", "parents": [ "079e121934106860af5ff5491bd3884453d1fdb3" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Mar 31 15:40:16 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Apr 09 22:44:26 2015 +0000" }, "message": "Add expiration update and keys change events\n\nIn support of unprefixed EME\n\nbug: 19771612\nbug: 19771431\nChange-Id: Ib19d4c8db25f5b09f9a30ebd4992b668cad9bfc4\n" }, { "commit": "d072c909d87f8150433860f6de4c11df6e09e2f9", "tree": "57ddf1e47d3ce322e10214991e01b509aeeb1155", "parents": [ "eb0ee0e842d3b8294aa6c0b797eaf7aff3fd2f89" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Mar 16 13:39:29 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Mar 16 15:39:03 2015 -0700" }, "message": "Report key request message type for unprefixed EME\n\nbug: 19771299\nChange-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6\n" }, { "commit": "b7909adcef247c627fbe8026624b9ecbeba47655", "tree": "cf7811b2be965f25ac62c75479e6d9f69cc3a98f", "parents": [ "d35c21207762c33c6f8f517e52533d6738d9adf0", "64b08d230c94872e014831bdb7b8a323c4b584ec" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Jan 26 19:12:22 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 26 19:12:22 2015 +0000" }, "message": "am 64b08d23: am cbb803a5: Merge \"Remove superfluous OpenSSL include paths.\"\n\n* commit \u002764b08d230c94872e014831bdb7b8a323c4b584ec\u0027:\n Remove superfluous OpenSSL include paths.\n" }, { "commit": "683202e1d42d2642f7471272b4a3b5d64525a7bf", "tree": "803ba36e5830c8ae133edf7c7ca3f12f73c2bb79", "parents": [ "1ed13b3b443735e7f7b5002954f31741b0b1c572" ], "author": { "name": "Adam Langley", "email": "agl@google.com", "time": "Thu Jan 22 17:14:35 2015 -0800" }, "committer": { "name": "Adam Langley", "email": "agl@google.com", "time": "Thu Jan 22 17:14:35 2015 -0800" }, "message": "Remove superfluous OpenSSL include paths.\n\nThe libcrypto and libssl modules (and their respective static and host\nversions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module\nis sufficient.\n\nChange-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e\n" }, { "commit": "9226e7c5eba914e6917bf59e1b26417aedf1436a", "tree": "6fda60ccce15fdb226a5a4c13da7dd256a575a57", "parents": [ "7382b352e63733abbb45a9b94131b08f669cb33c", "2f702c9bc0d07f5d48f6f50586b1e11d9ac59381" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Nov 11 22:55:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 11 22:55:59 2014 +0000" }, "message": "am 2f702c9b: am 43e10bb7: Merge \"Move to libc++.\"\n\n* commit \u00272f702c9bc0d07f5d48f6f50586b1e11d9ac59381\u0027:\n Move to libc++.\n" }, { "commit": "effaa7832a095c11acedbe488ebbeff296f35ab8", "tree": "494025ec49599f8063725d35bb34d8106792d167", "parents": [ "9527a598825830d697f9d7e1513accfbf66d7aeb" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Nov 10 14:47:41 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Nov 11 14:29:50 2014 -0800" }, "message": "Move to libc++.\n\nThis also cleans up some makefile cruft.\n\nBug: 15193147\nChange-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e\n" }, { "commit": "d556fad7475f4cd05a2199e9716ed8e01aa0ea9b", "tree": "54ec9d3bf73ceb8647f421bd8ff095a529e4ddaa", "parents": [ "e86c6d59dfa8aea8f321287cbb1f122623e5417a" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Nov 05 20:11:10 2014 -0800" }, "committer": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Thu Nov 06 15:54:14 2014 -0800" }, "message": "Fix build, update mock drm plugin\n\nBug: 18280078\n(cherry picked from commit 85c737a67e1b679251fce7f456ae79eefdc15e07)\n\nChange-Id: I341981e71d87be666787d9c866fc71a6b758c0e9\n" }, { "commit": "3c1285e8f86bd497e14c14fb6df7b42072ef52bd", "tree": "82c107d9b3001bf4f9d375b7d655968abe20c2c3", "parents": [ "6e8212b2a02685e50d0c093a6f44d9af636261d9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Oct 31 00:55:16 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Oct 31 00:55:16 2014 -0700" }, "message": "Add missing secure stop methods\n\nb/18053197\nb/18076411\n\nChange-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896\n" }, { "commit": "c2320223222fe4507b6d67f6b8b4001d26c77a9c", "tree": "874d89b68934c19a559f6d6b3ddaff3f44fcaa02", "parents": [ "ca61a8f0bc22606cb11b99bdb10a146f941d556e" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 04 15:02:19 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 04 15:02:19 2014 -0700" }, "message": "Fix build break in mock drm plugin build\n\nChange-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572\n" }, { "commit": "68b15554f6dca3b056eac517fe5fa2fd4ee80a33", "tree": "d6842666f3d062427b56f27c0b9e6e09976389a5", "parents": [ "fdefe34f40ea6c8964677eaa9107958b0bdf76d0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 30 10:19:03 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 01 17:16:16 2014 +0000" }, "message": "Allow device to be unprovisioned\n\nbug: 12247651\nChange-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e\n" }, { "commit": "4ebf92c0418584f1bb5ab3e83e8398351f4c05e5", "tree": "b4334f0cebcc481eee446cb041107aba7af9da7d", "parents": [ "62922fd0e6186dd5f53fe6406df10468e80dfb47" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 10:32:59 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 11:08:38 2014 -0700" }, "message": "Create a single test binary.\n\nTo run individual test suite, follow the example shown below:\nadb shell LD_LIBRARY_PATH\u003d/system/vendor/lib/mediadrm /system/bin/ClearKeyDrmUnitTest\n--gtest_filter\u003dJsonWebKeyTest.*\n\nChange-Id: I8ecc944a734cde351505a7cd8c3997976d74553b\n" }, { "commit": "2421a4ba309f082a83be9b8e385c00cd8e0043f6", "tree": "ef335b48b2340c17f880a79e98cf273103b4c39d", "parents": [ "8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 08:43:12 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 09:27:33 2014 -0700" }, "message": "Fix build target path.\n\nChange-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e\n" }, { "commit": "8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f", "tree": "4c88b6de2ccd4a587c39643b955412586d5a5e6c", "parents": [ "1fe11a5d1b7932a8a4a4e6e8cf1aedd21fcdb3aa" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Mon Jun 23 12:11:56 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Mon Jun 30 20:32:25 2014 -0700" }, "message": "Add Unit Tests for ClearKey Plugin\n\nChange-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3\n" }, { "commit": "1fe11a5d1b7932a8a4a4e6e8cf1aedd21fcdb3aa", "tree": "43dab16377cd28fe8bd7a75ae8878f75b37673f7", "parents": [ "7bdf28d2b83e527f474e96b0984d6a3f5eb457f7" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Tue May 13 22:22:44 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Tue Jul 01 03:27:45 2014 +0000" }, "message": "ClearKey Implementation of DRM Plugin APIs\n\nAdds shared-object entry points and interface implementations that\nimplement the Android ClearKey DRM Plugin API.\n\nChange-Id: Ie889747492cf85efe883149833105538faaa4cfe\n" }, { "commit": "7bdf28d2b83e527f474e96b0984d6a3f5eb457f7", "tree": "e35d68483c98e5b261b14102c4cd38f461441114", "parents": [ "6b3c1473199927264691bb50445cf0b35c2f8892" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu May 15 17:24:57 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Tue Jul 01 03:27:03 2014 +0000" }, "message": "JsonWebKey support.\n\nParses JSON Web Key Set in the response data; extracts and base64 decode\nkey id(s) and key(s).\n\nbug: 12035506\nChange-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e\n" }, { "commit": "6b3c1473199927264691bb50445cf0b35c2f8892", "tree": "544711204babcd928e566bdba7a3cc76865d5687", "parents": [ "16dfdcff6e4bb025220b88d5fc132ae48e7cb437" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Tue Jun 10 21:12:56 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Tue Jul 01 03:26:37 2014 +0000" }, "message": "Implement ClearKey Init Data Parser\n\nImplements an object that can convert ISO-CENC or WebM initialization\ndata into a ClearKey license request.\n\nChange-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e\n" }, { "commit": "16dfdcff6e4bb025220b88d5fc132ae48e7cb437", "tree": "ae5681b8b32fa261d281749439dc8d912756fa28", "parents": [ "47a86fb32803a37f03a40e4ea13e1f7db6cd728d" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Tue Jun 10 21:12:37 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 03:16:15 2014 +0000" }, "message": "Implement OpenSSL-Based Decryptor\n\nImplements an object that does AES-CTR-128 by invoking OpenSSL.\n\nChange-Id: I8457899ec8b69bd8f0d727029985c9580911cf99\n" }, { "commit": "47a86fb32803a37f03a40e4ea13e1f7db6cd728d", "tree": "b7af2222869cda40e27fd8a59eb36e9678fea961", "parents": [ "f92f22becdf7fce1f55d5ebd80ac2caa2ad55602" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Thu May 15 16:37:05 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 03:02:49 2014 +0000" }, "message": "Add ClearKey Utilities\n\nAdds some utility functionality that is shared by multiple parts of\nthe ClearKey code.\n\nChange-Id: I33a896eb68b2937918f145c9bd27174a119294b9\n" }, { "commit": "f356a123bf966150965a1af1cb9bd6ff2ca020de", "tree": "22c31d7cd8430663ee6a78b5daafffc718f11454", "parents": [ "4f1ef2cd65d734edae17f8586cf717598b40f2c3", "68d9d71a792deed75d32fe13febc07c9c12c8449" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 01 22:00:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 01 22:00:45 2014 +0000" }, "message": "am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u002768d9d71a792deed75d32fe13febc07c9c12c8449\u0027:\n Support CAST V2 Authentication in MediaDrm\n" }, { "commit": "68d9d71a792deed75d32fe13febc07c9c12c8449", "tree": "15ba0a2a541bd0b69fa286d04c9cc40d30b49871", "parents": [ "1000d426bedb1ec38bdfff98fc8f004b64af13cb" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Mar 04 13:21:31 2014 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat Mar 29 08:43:09 2014 -0700" }, "message": "Support CAST V2 Authentication in MediaDrm\n\nJava API version\n\nUpdate frameworks to enable support for CAST\nV2 Authentication in the DRM Plugin.\n\nChange-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861\nrelated-to-bug: 12702350\n" }, { "commit": "f2d170f6790329dd73c61b8704055e1dff4112a2", "tree": "69d36b08bcac8aea963c5f6b022b8438b714d126", "parents": [ "8fc4d57d41f532b90187b9404a8ac705770d75b4" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "message": "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\n\nChange-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6\n" }, { "commit": "377b2ec9a2885f9b6405b07ba900a9e3f4349c38", "tree": "b938e1d75a1beefae86244f287ca22f4a277740d", "parents": [ "cdda7bf4d3ca9cad6979374a18dd5be79ea83d80" ], "author": { "name": "Kévin PETIT", "email": "kevin.petit@arm.com", "time": "Mon Feb 03 12:35:36 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 11:40:06 2014 +0000" }, "message": "Make frameworks/av 64-bit compatible\n\nContains the necessary changes to make frameworks/av build and work\non a 64-bit machine.\n\nSigned-off-by: Craig Barber \u003ccraig.barber@arm.com\u003e\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n\nChange-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43\n" }, { "commit": "34486800a022857b45c3882624449980c5cb6907", "tree": "06e1a76a831666df008d5ba344b2c8e34bce27ef", "parents": [ "fe346c707f59d763ded93bc3d27b51f0c0408258" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 11 18:40:44 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 11 18:40:44 2013 -0700" }, "message": "Fix MediaDrm cts tests\n\nMoving the build of the mock MediaDrm plugin back to\nframeworks/av since it can\u0027t be installed by cts.\n\nb/10668350\n\nChange-Id: Id662bdb0775389b458f86a299392217f2d959422\n" } ], "next": "ee7e77d55d510725a314d8ed36dc730c21af6173" }