)]}' { "log": [ { "commit": "da98abadbca65909dbd8b040eddd4b1a2b7633e8", "tree": "2471af8816ad4dfba9dc883254fed202620296ca", "parents": [ "65a438c6429c7f46cb0ab056c7f672ea0aa9e7f5", "ab394d13bab3a84f23677357576cee7a6f0c7899" ], "author": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Sun Jan 21 02:25:17 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Jan 21 02:25:17 2018 +0000" }, "message": "Merge \"Add support for getMetrics to IDrm\"" }, { "commit": "ab394d13bab3a84f23677357576cee7a6f0c7899", "tree": "49544ed51667ba0850b776529294be75de491961", "parents": [ "0b68d531017a66db63cc8c41ba28a4f15e9816f0" ], "author": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Fri Dec 22 12:34:20 2017 -0800" }, "committer": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Fri Jan 19 16:29:47 2018 -0800" }, "message": "Add support for getMetrics to IDrm\n\nAdds support for the new getMetrics call to the IDrm interface and the\nDrmHal implementation. The implementation currently returns a dummy\nmetric collection. Follow-up CLs will flesh out the implementation.\n\nBug: 64001676\n\nTest: Ran the new unit test created in a related CL; ran Google Play.\nChange-Id: Ia6a3af5b59a30ca55267f7e3ba278a510fc8c81e\n" }, { "commit": "0426c97b51fef73b2df55379b69fff8db0703d57", "tree": "97c35b3ca81cb5ed5b9b5ee3c30d6b854f1530e7", "parents": [ "0b68d531017a66db63cc8c41ba28a4f15e9816f0", "783bd0d74d142493b4ef0a15a2664535854e99f9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 16 20:28:45 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 16 20:28:45 2018 +0000" }, "message": "Merge \"media.metrics changes AString -\u003e std::string\"" }, { "commit": "0b68d531017a66db63cc8c41ba28a4f15e9816f0", "tree": "80e8d673575914fee2016b8b9a59e4b86e194b10", "parents": [ "d6be64a3f22be3eceb0d6209c88dcad573c08191", "256a84920c4ce67fd8a4096f0e245ea738290b10" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jan 16 18:39:07 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 16 18:39:07 2018 +0000" }, "message": "Merge \"Fix use of uninitialized value in libmediadrm\" into oc-dev am: 5924e3db24 am: 444b037748 am: 74b97ba8f2\nam: 256a84920c\n\nChange-Id: I5e865beb3ae30a1e3305ed0d52e6ecc5e534992c\n" }, { "commit": "256a84920c4ce67fd8a4096f0e245ea738290b10", "tree": "733ef8787fcc28c8be5a24dcbfbc60f46ef3c9cd", "parents": [ "2c331aa92ae316380e7575fe3135903a3dae1a3e", "74b97ba8f248e6d5f9fd98f963d35944f0fe1229" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jan 16 18:23:39 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 16 18:23:39 2018 +0000" }, "message": "Merge \"Fix use of uninitialized value in libmediadrm\" into oc-dev am: 5924e3db24 am: 444b037748\nam: 74b97ba8f2\n\nChange-Id: I2747be2fd19e31dd99c985492c955c5b2e2b0f62\n" }, { "commit": "74b97ba8f248e6d5f9fd98f963d35944f0fe1229", "tree": "2fe9acb7c7c63136a3d56f3d6a69707e37ebbcd3", "parents": [ "4074f23f8d11e88417a037d88833ebb48358190d", "444b0377489aaa6b792e6f1472e95a5f9ee898e0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jan 16 18:12:30 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 16 18:12:30 2018 +0000" }, "message": "Merge \"Fix use of uninitialized value in libmediadrm\" into oc-dev am: 5924e3db24\nam: 444b037748\n\nChange-Id: I3031e17b0c9ccc8a4eadf78077b08e81e8d64e48\n" }, { "commit": "444b0377489aaa6b792e6f1472e95a5f9ee898e0", "tree": "b5ef3ed99d5af72425096e70e4f4f0ca1d71554c", "parents": [ "f24336a7e4549048a61b888ab581cedb2be439fa", "5924e3db2428f8b9ffce07add57ab7a7ad879269" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jan 16 18:01:27 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 16 18:01:27 2018 +0000" }, "message": "Merge \"Fix use of uninitialized value in libmediadrm\" into oc-dev\nam: 5924e3db24\n\nChange-Id: Ied4a966d455aabe8f94e1b85ce53e62bcdffd4d0\n" }, { "commit": "783bd0d74d142493b4ef0a15a2664535854e99f9", "tree": "60cbf56cb9d37670194d12cda8180767b6b5cfa9", "parents": [ "734d186db7ec3d1f877001d71c71de6562ead7f7" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Thu Jan 11 11:10:35 2018 -0800" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jan 16 09:25:15 2018 -0800" }, "message": "media.metrics changes AString -\u003e std::string\n\nchange from AString to std::string for how media.metrics handles\nstrings. This severs the dependency on libstagefright_foundation,\nwhere AString is implemented, so we can integrate into places\nwhich do not want to introduce a dependency on libstagefright_foundation.\n\nBug: 70805723\nTest: compilation/linking, CTS subset\nChange-Id: I66de971b6ec354444e06112607a2d7614084cef8\n" }, { "commit": "cf11d8f7b8f1e373c2a4ff731c100f7da635c518", "tree": "f718c4aa5adc946d6e2516a1bd9f5ac0f7c97586", "parents": [ "66d3fc1ff54c855139a8af91d4927474e3b5b0dc", "c8797836ab36a0f1c7fc956e72715680934c55a2" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jan 12 17:48:42 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 12 17:48:42 2018 +0000" }, "message": "Fix potential buffer overflow in mediadrmserver am: 5231cc164f am: 15a7d8c051 am: 54b0a54be4\nam: c8797836ab\n\nChange-Id: I51dd484521508341c56668b40ac44a9bb3d5d185\n" }, { "commit": "c8797836ab36a0f1c7fc956e72715680934c55a2", "tree": "a20bb958a50342a9c7569da72ae26ca5c6bec48f", "parents": [ "311b604047ca1c5aea85146502667a202e8a5e21", "54b0a54be472a947d46859018b8c6e41d9597a69" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jan 12 17:43:07 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 12 17:43:07 2018 +0000" }, "message": "Fix potential buffer overflow in mediadrmserver am: 5231cc164f am: 15a7d8c051\nam: 54b0a54be4\n\nChange-Id: I4a9005d159649603117eecc2b69a0c6f308c3cac\n" }, { "commit": "54b0a54be472a947d46859018b8c6e41d9597a69", "tree": "ef735548ba8f1e563f369d352488f6d4aa209c55", "parents": [ "ede9ead9e79adece54bc1ccee4405f722927d931", "15a7d8c051111072e4e601bd5ba0f9cb43e2ce2d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jan 12 17:37:32 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 12 17:37:32 2018 +0000" }, "message": "Fix potential buffer overflow in mediadrmserver am: 5231cc164f\nam: 15a7d8c051\n\nChange-Id: I6e90efefcc0d22fe8a4e1f64e99d1b9e0aeb57a9\n" }, { "commit": "15a7d8c051111072e4e601bd5ba0f9cb43e2ce2d", "tree": "cd7f8fd235cd4e1037c784b7c8b0f0bc9aa2de00", "parents": [ "45ff66df1b3c9909faab0fb9d364f6a1257fe6fd", "5231cc164fe040a3ab5fcb28baae4e0a4f9fdf4c" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jan 12 17:30:55 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 12 17:30:55 2018 +0000" }, "message": "Fix potential buffer overflow in mediadrmserver\nam: 5231cc164f\n\nChange-Id: I8ec126d09c8e5ef35a209431228ef3c49a1ee384\n" }, { "commit": "2442047f5c6d368f69fa81917f5aabc9b3c342a0", "tree": "46a63cbb73723b6f37fe6b8275c7045335ef4435", "parents": [ "5231cc164fe040a3ab5fcb28baae4e0a4f9fdf4c" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Jan 11 17:46:16 2018 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jan 12 07:45:26 2018 +0000" }, "message": "Fix use of uninitialized value in libmediadrm\n\nbug:70526702\ntest:gts media tests\n\nChange-Id: I29a67dad01ca8c8f649ba12cf08cc86b7eb56523\n" }, { "commit": "5231cc164fe040a3ab5fcb28baae4e0a4f9fdf4c", "tree": "31d50c9362c7f5e7c7c3c09f210a13a17a6ae200", "parents": [ "028cf0973f928503e89124c3f6493a5226826ed9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Jan 11 00:14:53 2018 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Jan 11 22:17:02 2018 -0800" }, "message": "Fix potential buffer overflow in mediadrmserver\n\nbug:71389378\ntest: gts media tests\n\nChange-Id: Ic7d4b456bc874b92fbe202e3dafb7ceac747ebc7\n" }, { "commit": "3692d9d49f822c1ce23bc5f28a9d18e4baa8398d", "tree": "1a39b027c3a7f81e1cafd276e76c8ee660484812", "parents": [ "7857e9da335366d220c187e67022a910ebabf874" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jan 09 15:55:44 2018 -0800" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jan 09 15:55:44 2018 -0800" }, "message": "Cleaner logging in a 32/64 bit world\n\nUse the portable PRId64 construct to print our 64-bit value.\n\nBug: 16890215\nTest: compilation\nChange-Id: If1b5d1731c8d2c4dc267889763ec04a4e3ac5e8e\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": "0e76dd5fdf8963f4b9fe217eb6e021b63d3382ee", "tree": "010843504c83aaf5b36e3a4f278c62312004fef4", "parents": [ "1b9f449f63329baa3adfb13818b3becbb9b900b8", "35b70b7d4557ac0341324a13a62ed61ee9c0f466" ], "author": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Wed Dec 20 20:27:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 20 20:27:41 2017 +0000" }, "message": "Merge \"Fix integer sanitizer in clearkey.\" am: 2c5f9f1b33\nam: 35b70b7d45\n\nChange-Id: If697e8fcfca91ea582c88c7d236abe835aa228ea\n" }, { "commit": "f1151c3ef7542a4df602338e13305d7bbb24e6d6", "tree": "54fcd07c2f5d825f5e4623166c5c090909834c64", "parents": [ "240201e27b1722009907a31983825668f2416ec2" ], "author": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Thu Dec 07 13:08:52 2017 -0800" }, "committer": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Tue Dec 19 15:30:05 2017 -0800" }, "message": "Fix integer sanitizer in clearkey.\n\nCalculating index sometimes causes an unsigned integer overflow. This\nthrows a runtime error on integer sanitized builds.\n\n runtime error: unsigned integer overflow: 0 - 1 cannot be represented\n in type \u0027unsigned int\u0027\n\nSince this gets implicitly converted to ssize_t anyhow, make the\nconversion explicit before decrementing to avoid the overflow.\n\nBug: 30969751\nTest: Compiles.\nChange-Id: Ibd39c1ba0dc64673743672ffc70c22c09f8e828a\nMerged-In: Ibd39c1ba0dc64673743672ffc70c22c09f8e828a\n" }, { "commit": "65f6932447d4c40d986d7c56806dc84ff7ca667b", "tree": "debaa1bef12539583563c1a0507e5179cbfb90d3", "parents": [ "8274c0a88e4ddd6747cabb3a7274f1ae68c7ee0d", "3169eaa60aa85883f232e878043520ae5bd05e5e" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 23:25:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 15 23:25:17 2017 +0000" }, "message": "Merge \"Fix compiler warnings.\" am: 8ef5c3d274 am: c6b02f7802\nam: 3169eaa60a\n\nChange-Id: I0fa6efd46f9bae7251a1ec5edd5bd03d1abdd56d\n" }, { "commit": "3169eaa60aa85883f232e878043520ae5bd05e5e", "tree": "748366afd45bc4274fbad06f74fd18f68ebdf992", "parents": [ "74277cb6f93451c4f047360b7e6d8971b345b868", "c6b02f7802d1c3cd96aeb1b14f3875b2e8f4c1e7" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 23:21:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 15 23:21:52 2017 +0000" }, "message": "Merge \"Fix compiler warnings.\" am: 8ef5c3d274\nam: c6b02f7802\n\nChange-Id: I100ebf1d7aecc903fd19a7cb871a34d149f35224\n" }, { "commit": "74277cb6f93451c4f047360b7e6d8971b345b868", "tree": "23e4af58964bcf65466c1460cbe113636b22135d", "parents": [ "0889cc7d3da1701d3cf8044c560fa73140372dfb", "b210ec3fea4596cad846f324f42349bb5e19d097" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 23:21:24 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 15 23:21:24 2017 +0000" }, "message": "Merge \"Fix format string warnings\" am: b50a7dcded\nam: b210ec3fea\n\nChange-Id: Ie1b30a4c0397655ea574265a7fb3f78f21f5fe87\n" }, { "commit": "8ef5c3d27484bee4a64210de17e18f001469ed96", "tree": "ad0c813cdd07ac36bcbcc2f8953728bf54b56a4c", "parents": [ "b50a7dcded67c4b4cafd35304822d1b358d0e88b", "b0a0235b7627d8c03c99e992a401a8c98c7bcd4e" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 23:08:42 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 15 23:08:42 2017 +0000" }, "message": "Merge \"Fix compiler warnings.\"" }, { "commit": "b0a0235b7627d8c03c99e992a401a8c98c7bcd4e", "tree": "8b2e64a83fc6d2f5bbbb98d9f29ec5595354e3b7", "parents": [ "aba76c0dbdf3ef55206c4c97d9a2f4f3d7aa69c2" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 10:14:30 2017 -0800" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 10:39:38 2017 -0800" }, "message": "Fix compiler warnings.\n\n* Comment out unused parameters.\n* Remove unused local constants.\n* Use both unsigned/signed values for EXPECT_EQ.\n\nBug: 66996870\nTest: normal build.\nChange-Id: Ia396e5ba1f57e547ac731bd7cdb3e6ff4290b52a\n" }, { "commit": "a58ea94498abc5ed1321bd2542ac31b3607dc21e", "tree": "318a88bfd878abfd5612097d7b6d0cacd03accf0", "parents": [ "aba76c0dbdf3ef55206c4c97d9a2f4f3d7aa69c2" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 10:23:13 2017 -0800" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 15 10:23:13 2017 -0800" }, "message": "Fix format string warnings\n\nMockCasPlugin.cpp: These are printing out `size_t`s, so we should be\nusing %zu.\n\nClearKeyFetcher.cpp: asset_.id() is an `unsigned long long`, so we\ncan\u0027t use PRIu64 for it.\n\nBug: None\nTest: mma. Warnings are gone.\nMerged-In: Ie34acb274696dea999f6309fb914b39ef00f4d77\n(cherry picked from commit 843328ff13456dbdfca72e3825222bcc65f4fac3)\n\nChange-Id: I7be4fff7d3fd603b7ab64397a6a05c28f7a34ace\n" }, { "commit": "599660ea6a581eda4b2f62caf7b086814f2b2ba3", "tree": "bc55003596d1c4ec0fc3a86304aff644995a433f", "parents": [ "be9b9730488a13add26e1c9f301f7ba3e4a26945", "5593d3a8ad8514d85e3c7398a3bab7eff53152dd" ], "author": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Thu Dec 14 18:52:51 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 14 18:52:51 2017 +0000" }, "message": "Merge \"Fix integer sanitizer in clearkey.\"" }, { "commit": "5593d3a8ad8514d85e3c7398a3bab7eff53152dd", "tree": "2398dbffa66fbbed679681894a47807a613d86fe", "parents": [ "eda72c27cab52c41016d8ce138438a2d59973231" ], "author": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Thu Dec 07 13:08:52 2017 -0800" }, "committer": { "name": "Ivan Lozano", "email": "ivanlozano@google.com", "time": "Thu Dec 07 13:08:52 2017 -0800" }, "message": "Fix integer sanitizer in clearkey.\n\nCalculating index sometimes causes an unsigned integer overflow. This\nthrows a runtime error on integer sanitized builds.\n\n runtime error: unsigned integer overflow: 0 - 1 cannot be represented\n in type \u0027unsigned int\u0027\n\nSince this gets implicitly converted to ssize_t anyhow, make the\nconversion explicit before decrementing to avoid the overflow.\n\nBug: 30969751\nTest: Compiles.\nChange-Id: Ibd39c1ba0dc64673743672ffc70c22c09f8e828a\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": "4593b04bdad2ae66b22c5d3fb78276b523b7e942", "tree": "d855fc3d7505c608fc720474d2af565feb131738", "parents": [ "ea8dd2c787f88e7289ffb8f226237587f95d8a93", "79edadcea74151b573d5b973d5a421baee693ec1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Nov 10 15:29:40 2017 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Nov 10 15:33:45 2017 -0800" }, "message": "Merge commit \u002779edadcea74151b573d5b973d5a421baee693ec1\u0027 from\noc-mr1-dev-plus-aosp into stage-aosp-master\n\nChange-Id: I04234f284e3117e8343e7c888646400c81f5a131\nMerged-In: Icf228c701afe37dd3c7f00ea9e6fb740b0d450f1\n" }, { "commit": "a71eb1246db9d1252e598894156ac7fbb1baa79f", "tree": "6827b07e8ff21d49a5a274476736cb2443c62474", "parents": [ "92fefbd90b4cac0db75a28f2c2a3f8ca076ca8ec", "9dcd300f2282e0512c35b4e1d1da0af712149d13" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Nov 06 21:12:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Nov 06 21:12:53 2017 +0000" }, "message": "Merge \"cas: validate shared buffer size before using -- DO NOT MERGE\" into oc-dev\nam: 9dcd300f22\n\nChange-Id: Id45c173949fb211b5e12dedb459d94fd22beb513\n" }, { "commit": "9dcd300f2282e0512c35b4e1d1da0af712149d13", "tree": "08fd5cb27e493fbb7207b6e6891725462cca449e", "parents": [ "af7531a4787f095d47db811d79bf846d318f6b66", "0211980a373ea71a9556d79fdd60f23c5550024f" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Nov 06 21:07:46 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 06 21:07:46 2017 +0000" }, "message": "Merge \"cas: validate shared buffer size before using -- DO NOT MERGE\" into oc-dev" }, { "commit": "0211980a373ea71a9556d79fdd60f23c5550024f", "tree": "c61de5c657e0cdb27ae6f973858b07e272e9d514", "parents": [ "7947199a58ef4644c9de909585f12432fea30f90" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Oct 31 15:02:52 2017 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Nov 06 21:05:46 2017 +0000" }, "message": "cas: validate shared buffer size before using -- DO NOT MERGE\n\nbug: 67962232\n\ntest:\ncts MediaCasTest\n\nChange-Id: I6bafa324fe6bca5c6a172cc4f9f724ba9f44b7ba\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": "f652841738551ff4a4ff3908902faf36fc57e3ac", "tree": "89c3b9929a99d30474763461a210f01eb6739fdc", "parents": [ "fb5614c226c2998545c68ce4232c1576212ab6b4", "4a9ffdec3b3952dca4635b3d0e61a575eddb53d9" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Oct 31 19:29:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 31 19:29:33 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 am: 96e83fb2fe\nam: 4a9ffdec3b\n\nChange-Id: Ia1edcab34f26d8506ccf1e9b1b6c77d15e72d867\n" }, { "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": "c56f27b269800c1e8441908c3d564c63e0257f56", "tree": "c224cba0fe55a8dca9deff2519a2fc9fedd7e7ef", "parents": [ "6086cd30a510375fb7d060467ef062f7ba697f3c", "90f704352e8a4f10ed0afa37dedffdfc9f45b484" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Oct 20 19:36:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 19:36:38 2017 +0000" }, "message": "Merge \"Use -Werror in frameworks/av\" am: cf8437acd9 am: d9c907b8fd am: 11ebad3460\nam: 90f704352e\n\nChange-Id: If65473d6117b67a4e2c0b5e359e3a6820d6e5c5e\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": "11ebad3460e8199ff2772e8124af255a9c702a2f", "tree": "f4610ede8e8accfa5041951afacdc2f6e71d71e4", "parents": [ "449a6393addac5313180551ef829094d9e7cae34", "d9c907b8fd9bc146c366b55dc689987b4fa31352" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Oct 20 19:26:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 19:26:56 2017 +0000" }, "message": "Merge \"Use -Werror in frameworks/av\" am: cf8437acd9\nam: d9c907b8fd\n\nChange-Id: I1878de4a1cdcbd3099c9f1ad877184595fc17750\n" }, { "commit": "d9c907b8fd9bc146c366b55dc689987b4fa31352", "tree": "47e3c66c265cea2adbc335cd82cf993bfc3b790e", "parents": [ "44f40bc03de45b2b8a41f161c4a48893e7aec2d1", "cf8437acd9d973e416702d9bddefea3ef2905e05" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Oct 20 19:24:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 19:24:52 2017 +0000" }, "message": "Merge \"Use -Werror in frameworks/av\"\nam: cf8437acd9\n\nChange-Id: I127128dfac19e14e2743dfddefe75f65fb72897f\n" }, { "commit": "cf8437acd9d973e416702d9bddefea3ef2905e05", "tree": "26aeeed8385c027537a9bed4b0d4b0280c0b380b", "parents": [ "7a23b30bd0c997ddf5bd3284da43b3efc32bec20", "5cf0751390afa26b8fefacbf43541d7d4cffc1a5" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Oct 20 19:19:17 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 20 19:19:17 2017 +0000" }, "message": "Merge \"Use -Werror in frameworks/av\"" }, { "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": "56a687d9d2b989a293dc78c9b728f33b5eaba991", "tree": "52c51850c44cc28c46b80af8797372f2e3d4b22d", "parents": [ "a6c08e78abda6bd7e4196c85ee19da96846d032a", "a3ad5bda668f09124e3a8da53075a8e02d38b10f" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Oct 20 05:06:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 05:06:39 2017 +0000" }, "message": "Merge \"Use libhidl function to convert to hidl IMemory.\" am: b63a28ffb1 am: 86d60a6bf6 am: d818b6f9a3\nam: a3ad5bda66\n\nChange-Id: I0210db2cd6cf129d555439ee3eceba211eb05f54\n" }, { "commit": "a3ad5bda668f09124e3a8da53075a8e02d38b10f", "tree": "fffa8c7461659ba0ecb7329ee00f344c712f9e89", "parents": [ "b3b0f21b4ae2f4c9893992c4d0df887c8bfc2e0d", "d818b6f9a32c82878d56da7989a5f12e7d8182b9" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Oct 20 04:53:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 04:53:38 2017 +0000" }, "message": "Merge \"Use libhidl function to convert to hidl IMemory.\" am: b63a28ffb1 am: 86d60a6bf6\nam: d818b6f9a3\n\nChange-Id: I09155502d7260202065a39d5f5b6e64066f5313d\n" }, { "commit": "d818b6f9a32c82878d56da7989a5f12e7d8182b9", "tree": "1b4880966ffb27ef688918aa8968c91c25d788e2", "parents": [ "033c6373ef3a52318bc8f383471910c987711f18", "86d60a6bf6629d55d3aeb3f6ceae3a443b40044b" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Oct 20 04:51:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 04:51:31 2017 +0000" }, "message": "Merge \"Use libhidl function to convert to hidl IMemory.\" am: b63a28ffb1\nam: 86d60a6bf6\n\nChange-Id: I70e0dd71932e727ede2a551d2992dd89de7b489a\n" }, { "commit": "86d60a6bf6629d55d3aeb3f6ceae3a443b40044b", "tree": "27e9f5210f4b73237c7d38d20d5e2d92bc36a9e9", "parents": [ "bae12e14dc94ff031612b1266f68657719bd54c5", "b63a28ffb1f9e959d5d352da992ed2a37423b4e6" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Oct 20 04:47:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 04:47:26 2017 +0000" }, "message": "Merge \"Use libhidl function to convert to hidl IMemory.\"\nam: b63a28ffb1\n\nChange-Id: I72204f417430d7d8974c9dff4d2103def56f7fcc\n" }, { "commit": "b4ce81d08dfa9434ec98569e07f98af08750a9fa", "tree": "53dc78fede29d80887078d9cbe22be6e13cbde9b", "parents": [ "08ceacb250fbf54198f8c08f2dd94a3c8681d804", "6e18d372ac1cf3f36be2bfba2bc330c79ab8bd26" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 22:50:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 22:50:08 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758 am: 650e3e6325 am: 2921de78e6\nam: 6e18d372ac\n\nChange-Id: Ic1fa257c7d8e7bb934b8f8b103168b6670bed309\n" }, { "commit": "6e18d372ac1cf3f36be2bfba2bc330c79ab8bd26", "tree": "04db9a09df7ffd6ca55a82612c596f77c339cf52", "parents": [ "a21a8b03018ccca95664ccb7ac4596bbf5ce1322", "2921de78e6a7df365ed806cf4b98193862a97807" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 22:24:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 22:24:32 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758 am: 650e3e6325\nam: 2921de78e6\n\nChange-Id: I22aa2636a34be6b140d96cc005d5526cb7270e51\n" }, { "commit": "8db99a18d84f4448918541a7fa1e8bf142d07566", "tree": "157a8f249115bb2ed00a12de50b37abe90876509", "parents": [ "748e0d01caaa1298c18ef5b5aab1a04dd8ca50b5", "650e3e6325c63dadb6bd14b8a13bc73ce1ec0990" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 21:48:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 21:48:38 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758\nam: 650e3e6325\n\nChange-Id: I5e38f52c09b2ab0192873bb7f23fab5c871b055b\n" }, { "commit": "2921de78e6a7df365ed806cf4b98193862a97807", "tree": "983a10fa24e422ae2648ca089278120e575ef6fc", "parents": [ "0f471b957302ce90ea0635ef2d59ff6df347bb5b", "650e3e6325c63dadb6bd14b8a13bc73ce1ec0990" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 21:47:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 21:47:38 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b am: 3cf728e758\nam: 650e3e6325\n\nChange-Id: I9109b02acf15f7498523569e432141da23edd6c6\n" }, { "commit": "650e3e6325c63dadb6bd14b8a13bc73ce1ec0990", "tree": "87ed563cd670b9d5241f7ae76a7d8412a78a5651", "parents": [ "d85a5aff430b50330863d01f41ebe76eab6b92de", "3cf728e75872fe62abd401a0ebdf567cfabaa523" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 21:30:07 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 21:30:07 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39 am: b3a0e4680b\nam: 3cf728e758\n\nChange-Id: I53e89f1f051e679cd7c6a5aa7cac2271231e435f\n" }, { "commit": "3cf728e75872fe62abd401a0ebdf567cfabaa523", "tree": "cb3def19d08449f5fa3c256043ef4f5cfbcde4a6", "parents": [ "ca8d765f1205b4d71e4815ebcf8287da05f0ea8b", "b3a0e4680b276a1b2a8cce47f9eca1d7fe804c74" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 20:54:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 20:54:26 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741 am: e2f8930c39\nam: b3a0e4680b\n\nChange-Id: I3da01ec0b6a9272ae6b7310f4758e526e9af00d7\n" }, { "commit": "6536606cfe53e6bdb6415e0f8986381074bd68cf", "tree": "17fa24d63f606cd3b3a114fb3e01c9c54b0fec21", "parents": [ "16f2c1559c5722a6cd69fef3c17dc5756ba73fe6" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Oct 05 11:34:01 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Oct 17 19:17:46 2017 -0700" }, "message": "Use libhidl function to convert to hidl IMemory.\n\nNow that this API is available.\n\nThis keeps the implementation details of hidl\u0027s\nashmem allocator in libhidl itself (it should be\nopaque).\n\nTest: try and succeed watching (part of a) DRM protected movie\nBug: 34234561\nChange-Id: Ied9beddace2ccfc859833ac55f4e3837db5f495e\n" }, { "commit": "72b054de2c3549b4186daf1a83b041fee4607158", "tree": "5b0249a8286e5f197c2aaef1260ef6a9a6bd5a8d", "parents": [ "dc29f723c017b2cda7784cde5155f4ddefd739ef", "ed82e9adc8435d0c756fd05a85810622a5b21e57" ], "author": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Thu Sep 07 19:32:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 07 19:32:09 2017 +0000" }, "message": "Merge \"Fix package name reporting in MediaDrm metrics.\" into oc-mr1-dev am: 7dca8d7587\nam: ed82e9adc8\n\nChange-Id: I97060dfe445f734a181b52972b7628376cef0f58\n" }, { "commit": "ed82e9adc8435d0c756fd05a85810622a5b21e57", "tree": "0e1cf85e48540329ee56064db75015187b3e6d2f", "parents": [ "4368de730778b5a742cba42ae9572a7dfc1bdf1f", "7dca8d75871e8f275932ddcd184d45fec763ac16" ], "author": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Thu Sep 07 19:29:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 07 19:29:59 2017 +0000" }, "message": "Merge \"Fix package name reporting in MediaDrm metrics.\" into oc-mr1-dev\nam: 7dca8d7587\n\nChange-Id: Id5828b367bf7bb31d989be52330ae1e23220d809\n" }, { "commit": "7dca8d75871e8f275932ddcd184d45fec763ac16", "tree": "c129061a68529d8301a6b5bdb6cd3b3627ca2e9e", "parents": [ "872011203ea90a0a15fcdcf4474e19d735206b37", "21c721250cef7722217c1e952a6923fb79c84e37" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 07 19:25:10 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 07 19:25:10 2017 +0000" }, "message": "Merge \"Fix package name reporting in MediaDrm metrics.\" into oc-mr1-dev" }, { "commit": "fe3c170a34f9c8a50f74ddbb817787aabb4ebec0", "tree": "25fa090e2cbe94a2ffcfb9076815162f0fa29f42", "parents": [ "a488402046bffd51803cc98815824a27f510d1c5", "cf43836c9a6f10d42f163a5fb1ed039d98f51dd6" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Sep 07 18:58:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 07 18:58:47 2017 +0000" }, "message": "Merge \"Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair.\" into oc-mr1-dev am: 872011203e\nam: cf43836c9a\n\nChange-Id: I6241d5d1231046988b155837f5454bdd60e70277\n" }, { "commit": "cf43836c9a6f10d42f163a5fb1ed039d98f51dd6", "tree": "5064011602062a643b1ec654a72214ca826e0ae1", "parents": [ "12131a23cbb03c083c6f53a30c58b9182de5e5fb", "872011203ea90a0a15fcdcf4474e19d735206b37" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Sep 07 18:52:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 07 18:52:47 2017 +0000" }, "message": "Merge \"Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair.\" into oc-mr1-dev\nam: 872011203e\n\nChange-Id: I4bac4afe446384c4a3062d2b46bf43ae974217e9\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": "21c721250cef7722217c1e952a6923fb79c84e37", "tree": "8e8fe4b4e90741607e4803b9098676049ddc6705", "parents": [ "e4bf97fbf4302bdea149fba4114b96b6ab9a4799" ], "author": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Tue Sep 05 19:02:06 2017 -0700" }, "committer": { "name": "Adam Stone", "email": "blueeyes@google.com", "time": "Wed Sep 06 22:21:14 2017 -0700" }, "message": "Fix package name reporting in MediaDrm metrics.\n\nThe app package name was not previously reported in drm metrics. This\nchange reports the app package name as returned from the vendor metrics.\n\nThis is part of the fix. The other change will go into another project.\n\nBug: 64584568\n\nTest: Unit tests, GTS tests, and Google\tPlay.\nChange-Id: Iee36d5203364c5f80a8b0fe9d9bbf5c167abefd1\n" }, { "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": "7b40873793fa1f788677a3844b56ccee4b888a0a", "tree": "9001412b3dd9681eda8aaa62375ce82a2f0a3c6c", "parents": [ "0888c8495f51b7e1314bd24f5d7da8e738818dc1", "eb68f293472472bcbded37f5b034289967935f97" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Aug 31 21:49:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 31 21:49:16 2017 +0000" }, "message": "Merge \"Fix ClearKey Drm base64 en/decoding to use base64url.\" into oc-mr1-dev am: 3b224af571\nam: eb68f29347\n\nChange-Id: Ie436596031a865f833c7a31ba8d49319a8d5bbb9\n" }, { "commit": "eb68f293472472bcbded37f5b034289967935f97", "tree": "119fff234c1363ec467a3f33179cf6ec2370911e", "parents": [ "469b161303e53d98b957e66247d013cc249b5b0e", "3b224af571e8e70ef643a36e144e7427857d271d" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Aug 31 21:34:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 31 21:34:00 2017 +0000" }, "message": "Merge \"Fix ClearKey Drm base64 en/decoding to use base64url.\" into oc-mr1-dev\nam: 3b224af571\n\nChange-Id: I2984f7bed0b659ad05bb6e3ce641ebeaf885a2a6\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": "52f34c8988bdaeccb715e36eec66ad2183f6158b", "tree": "1cb6eac66b2da437660ec63fd340e6b0a9d163f8", "parents": [ "a4c8a32c1af9dba2799357dee89eca386683cac6", "843328ff13456dbdfca72e3825222bcc65f4fac3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Aug 21 22:36:08 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 21 22:36:08 2017 +0000" }, "message": "Merge \"Fix format string warnings\"" }, { "commit": "843328ff13456dbdfca72e3825222bcc65f4fac3", "tree": "edec758a19ba88898024750e386529395909c394", "parents": [ "703ddd9df5c664a4bc2aac4c848fd89dc3b26f1f" ], "author": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Wed Jul 12 14:42:42 2017 -0700" }, "committer": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Mon Aug 21 12:26:42 2017 -0700" }, "message": "Fix format string warnings\n\nMockCasPlugin.cpp: These are printing out `size_t`s, so we should be\nusing %zu.\n\nClearKeyFetcher.cpp: asset_.id() is an `unsigned long long`, so we\ncan\u0027t use PRIu64 for it.\n\nBug: None\nTest: mma. Warnings are gone.\nChange-Id: Ie34acb274696dea999f6309fb914b39ef00f4d77\n" }, { "commit": "991f53aa6d2f9ca70f15e2f5f56485c7de41a9e2", "tree": "035e1e9abd9818b5a8ef05925b1bbad556bb962b", "parents": [ "ba8ec341fe2797d30fbc6d1858c4294e317f43b4", "1fb7851c8cb45d4f8f4c99b2997f34eb06f383d0" ], "author": { "name": "Zhizhou Yang", "email": "zhizhouy@google.com", "time": "Fri Aug 18 20:56:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 18 20:56:21 2017 +0000" }, "message": "Merge \"Fix memory leak warning in FwdLockEngine.cpp\" am: 809ea9d9cc am: b5c1bcb963 am: d10d7e154c\nam: 1fb7851c8c\n\nChange-Id: I0c6d84ad059a57461d562da02965166cc2300c1b\n" }, { "commit": "1fb7851c8cb45d4f8f4c99b2997f34eb06f383d0", "tree": "9adc3bc30a33814c0aea3affdf4e8edcf1b5bf79", "parents": [ "683e08988afe7b8b9df84df7b2bc7ebe6ed8ee02", "d10d7e154c7abd766c4fe560332c4f67c686ad1b" ], "author": { "name": "Zhizhou Yang", "email": "zhizhouy@google.com", "time": "Fri Aug 18 20:50:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 18 20:50:20 2017 +0000" }, "message": "Merge \"Fix memory leak warning in FwdLockEngine.cpp\" am: 809ea9d9cc am: b5c1bcb963\nam: d10d7e154c\n\nChange-Id: I844f0f7f265c7831cf45b8ddf6755f42aa35ee13\n" }, { "commit": "b5c1bcb963dc638d4f67b6b016509c174363f48e", "tree": "a8c524c36516f2da8ff9fe00f06d2e83cad3a5b9", "parents": [ "70b1b4007116a8f99041c0c78f42cc2c2a1c8d01", "809ea9d9ccecafd9295f9be6e4930bafb55c6f68" ], "author": { "name": "Zhizhou Yang", "email": "zhizhouy@google.com", "time": "Fri Aug 18 20:39:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 18 20:39:34 2017 +0000" }, "message": "Merge \"Fix memory leak warning in FwdLockEngine.cpp\"\nam: 809ea9d9cc\n\nChange-Id: Id83653de65130ab3f73a720d9196d5ae47ec9613\n" }, { "commit": "420b2094a3091ba18e63ba50b287ee813b6c2188", "tree": "c830efed1fdee68b500e5a3692208a94be4d3e31", "parents": [ "3ff6cb8f7065b2fd1f78f24d7d76e9a6fdeb2140", "d8d7bf6128253b740bd6515e2371f5f74c5ccea8" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Aug 16 22:22:39 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 16 22:22:39 2017 +0000" }, "message": "Merge \"Support both Clear key plugin UUIDs.\" into oc-mr1-dev" }, { "commit": "67810646ca83b77940eb9b54c507d2940eabf7c6", "tree": "8dd5931ddcf92e34669e7a9279466de3025cf268", "parents": [ "f402866c6aab58d8f991f1122976714caebf7eee" ], "author": { "name": "Zhizhou Yang", "email": "zhizhouy@google.com", "time": "Tue Aug 15 16:43:12 2017 -0700" }, "committer": { "name": "Zhizhou Yang", "email": "zhizhouy@google.com", "time": "Wed Aug 16 10:14:39 2017 -0700" }, "message": "Fix memory leak warning in FwdLockEngine.cpp\n\nIf addValue does not succeed, there will be memory leak on\ndecodeSession. Fixed it by checking if addValue returns true first.\n\nPlus fixed a small indentation error.\n\nTest: mmm with static analyzer and warning disappears.\nChange-Id: Ibf9b85e4c416e8fea8b80a3ba47f87f88573c54c\n" }, { "commit": "eae126d32aacfd3b2ac5dba059571d30ce8a7444", "tree": "cd851bc637312fe0d601039197514edb01fff766", "parents": [ "349d9c945b8266f16a3069e58087a8301a4f3fc2", "3373ab6abee9dfd82052a3ace164dc698af0a9e7" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 09 01:09:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 01:09:05 2017 +0000" }, "message": "Merge \"Fix failure to check HIDL return status\" into oc-dr1-dev\nam: 3373ab6abe\n\nChange-Id: Idb5225d222ef732b4bdd43896e81bc0b20f7dc8a\n" }, { "commit": "76abba2b611e2a59d7589896444c9e13ea213e9e", "tree": "7fef54bbdca9293888d71292bf1d0728ce5f3de8", "parents": [ "70daea36ae7426cd15f4b43503f35cfa40b581f8", "3373ab6abee9dfd82052a3ace164dc698af0a9e7" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 09 01:09:03 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 01:09:03 2017 +0000" }, "message": "Merge \"Fix failure to check HIDL return status\" into oc-dr1-dev\nam: 3373ab6abe\n\nChange-Id: I21ef6e954dd40aca58e598a82e28cf66744e2c1a\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": "f0e89b0b248976f622fc41da4f678955399def08", "tree": "aacaaae8e1ac94e6f240fe7fa3c2e35ec32836a7", "parents": [ "81b06822a7ad5034eee0a85fc32c527e669ab274" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 07 15:58:41 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 07 16:13:27 2017 -0700" }, "message": "Fix failure to check HIDL return status\n\nHIDL transaction status wasn\u0027t being checked\nresulting in a SIGABRT from createPlugin when the\nremote process dies.\n\nbug: 64441780\ntest: run Play Movies and repeat killing\n android.hardware.drm@1.0-service.widevine, check\n log for transaction failed messages.\n\nChange-Id: I0ea70578d60bb84cf693f158963181781d7e35c3\n" }, { "commit": "ab594a71430c1572bba05d28d2257f4f5aeeebc2", "tree": "8fe93be8a2dcf29732424ec5e93ff8244dddbca2", "parents": [ "ddc0123df747c3911da9e25645d892e92319c10b", "ddef08e7254cd593881711b9f812e062676b4b3d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 04 17:19:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 04 17:19:49 2017 +0000" }, "message": "Merge \"Fix failure to check HIDL return status\" into oc-dr1-dev\nam: ddef08e725\n\nChange-Id: Ic441d0866af810504bf99d746c77d02e95b1f035\n" }, { "commit": "81b06822a7ad5034eee0a85fc32c527e669ab274", "tree": "36254bc3c80bba3e0bc2f42a412f3224a093bd51", "parents": [ "a2208f7d01fefd9f402781ab24264b6732d6e934" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jul 26 15:44:33 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Aug 03 12:48:58 2017 -0700" }, "message": "Fix failure to check HIDL return status\n\nTest: run Play Movies and repeat killing\n android.hardware.drm@1.0-service.widevine, check\n log for transaction failed messages. This uncovered\n a related problem in closeSession which is also fixed\n in this CL.\n\nbug: 64022042\nChange-Id: I4e86414aa1625c35689339389391e9fa6d377b1c\nMerged-In: I4e86414aa1625c35689339389391e9fa6d377b1c\n" }, { "commit": "319d5f43d196ca1fc26c5d6169ae0bdd14a81d54", "tree": "d438af53c30d184547dbccf0dfdfff22d24580a9", "parents": [ "a63b4da5e41e7835b1ac6db235fd9764528082fc" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jul 26 15:44:33 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Aug 03 12:35:32 2017 -0700" }, "message": "Fix failure to check HIDL return status\n\nTest: run Play Movies and repeat killing\n android.hardware.drm@1.0-service.widevine, check\n log for transaction failed messages. This uncovered\n a related problem in closeSession which is also fixed\n in this CL.\n\nbug: 64022042\nChange-Id: I4e86414aa1625c35689339389391e9fa6d377b1c\n" }, { "commit": "33ecc4f6b0e53ea7088ff4f151323e29183070c5", "tree": "4a174497fc23c8a5ee993d0e7e6d6316edd052a1", "parents": [ "6133281c9b06c1d1176eca7f07401bba1067081e" ], "author": { "name": "John W. Bruce", "email": "juce@google.com", "time": "Mon Apr 03 16:49:05 2017 -0700" }, "committer": { "name": "John W. Bruce", "email": "juce@google.com", "time": "Tue Jul 18 16:40:44 2017 -0700" }, "message": "Marshal Metrics\n\nBecause DRM Plugins will not be allowed to call the AMI API under\nTreble, the mediadrmservice will need to marshal the metrics out of the\nplugin in protobuf format and report them to the AMI API instead. This\npatch implements the pulling and interpreting of metrics from DRM\nPlugins.\n\nBug: 36497276\nTest: Played Google Play Movies, verified that playback still worked and\n Widevine metrics appeared in a dump of the system media metrics.\nChange-Id: If07717c1b87022bc1fcdedfbc62b9193899742d5\n" }, { "commit": "6133281c9b06c1d1176eca7f07401bba1067081e", "tree": "7cd0391b116238c9122ff88cfd55a06fc5b80b60", "parents": [ "bc282920de2d648e9e13802714e579a1e4c57b3a" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon May 15 16:53:10 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jul 18 23:36:40 2017 +0000" }, "message": "Close all open drm sessions before destroying a plugin.\n\nMediaDrm relies on each plugin to close its open sessions\nwhen the plugin is destroyed. This change ensures that all\nsessions will be closed even if the plugin does not do it.\n\nb/38323088\n\nChange-Id: I8b6e36182f3b3bc765963819101868fc46001527\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": "bcbda5c5258e90e247004c7075509939188c330a", "tree": "2c5d00f2d32682988f2407223e55b19d7b4f409f", "parents": [ "711ba69c9835f099c90c2f72115766ef444ff301", "ee3491c350b87b7324727a606764a762513f9479" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 14 21:17:36 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 14 21:17:36 2017 +0000" }, "message": "Merge \"Make ClearKeyFetcherTest build with the VNDK.\"" }, { "commit": "8280e4156628d53c0a90c405fa57d4c40c33b62b", "tree": "813560d6d19f8b32572e9c0ef55dccbcbb60329f", "parents": [ "2c582f9dadb83b72a415d9235971eee356322720", "f0ee3c62f441031ac6c7fe3abb98a67b6e064cf9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 12 16:56:30 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 12 16:56:30 2017 +0000" }, "message": "Merge \"Build libmockdrmcryptoplugin with VNDK.\"" }, { "commit": "ee3491c350b87b7324727a606764a762513f9479", "tree": "568efd4040f742dd370c7821043cf0d04dad56c5", "parents": [ "ab5c38a7ac2ba27e680a95cac6c0b9d61c08771b" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Jul 11 10:16:23 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 12 15:34:07 2017 +0000" }, "message": "Make ClearKeyFetcherTest 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 ClearKeyFetcherTest with BOARD_VNDK_VERSION\u003dcurrent\nBug: 37342627\nChange-Id: If4a6b78f515a29c0af13ca1db8c75a06d10369eb\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": "c19c2a5b31718123223ea9392ae50bf76ca4f98d", "tree": "c1a53c24a6c3245758f878256ca37d747e669e1c", "parents": [ "35d622f2422412dab726d7c795d0fd593683ac64" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Jul 10 15:15:38 2017 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Jul 10 15:15:41 2017 -0700" }, "message": "Build libmockcasplugin 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: BOARD_VNDK_VERSION\u003dcurrent m -j k libmockcasplugin\n\nBug: 37342627\n\nChange-Id: I6129ae91458216f537f6fb4065ecd9f26739851c\n" }, { "commit": "04f7a67df16512832be4ef94fae71f955d6e2249", "tree": "699aca6bb0ad073334bbe0b616649f785c32d5dd", "parents": [ "38217e0d53b14e634243d1ce36fa5d3267c71056" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Jul 04 10:56:23 2017 +0900" }, "committer": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Jul 04 10:56:23 2017 +0900" }, "message": "Build libclearkeycasplugin with BOARD_VNDK_VERSION\n\nInstead of relying on the global include paths, use the new headers lib\n\u0027media_plugin_headers\u0027.\n\nBug: 37342627\nTest: BOARD_VNDK_VERSION\u003dcurrent m -j libclearkeycasplugin\nChange-Id: Ic6b5230bc9b674e21ccd36ce6ad117c687200599\n" }, { "commit": "8538e15909bae62c0788c7921515b7ccb1d866c6", "tree": "ada54771ddccda6e5dc1a8d1da30235d1126052e", "parents": [ "cd1038cfd8ffab08eb96e6c55dc799349073bb52", "d5a416a49d5074e2966f5fe255561cbaaf31a325" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 28 20:37:26 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 28 20:37:26 2017 +0000" }, "message": "Merge \"cas: convert MediaCas to HIDL\"" }, { "commit": "d29a82f816b0c49f56c2d674a9dd5391e558f6e4", "tree": "82fc466a07e8f8dae84eff332959a07f669773e6", "parents": [ "df4846c344cedb14f59da7f684d792910df6671a", "cb316c7ecc5520aa861f26e6f52114e5e5e9a902" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jun 26 17:59:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 26 17:59:31 2017 +0000" }, "message": "Use vendor variant of libstagefright_foundation.\nam: cb316c7ecc\n\nChange-Id: I9d37fbb24e0f984fd067dff1c24b336a2ee744dc\n" }, { "commit": "d5a416a49d5074e2966f5fe255561cbaaf31a325", "tree": "1ea87bb5fe5ed45acf272e403d618cfe17cba499", "parents": [ "2fdb0fff6c0f763841511308971444c1c920f35e" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue May 16 11:16:34 2017 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Jun 23 16:15:49 2017 -0700" }, "message": "cas: convert MediaCas to HIDL\n\n- Remove AIDL interfaces.\n- Replace usage with corresponding HIDL interfaces.\n- Move MediaCasService implementation from frameworks/av\n to hardware/interfaces/cas.\n\nbug: 22804304\n\nChange-Id: I56ab22565a43e91481ac2759ce69462bcc194046\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" } ], "next": "67c3e635b98a732d7c9f279c5084448b8dcb9748" }