)]}' { "log": [ { "commit": "a53d6553fce1818bdf87833f93633c93ad1b5915", "tree": "8fbbb7b32d753c75a7350d748d6fa08d47402289", "parents": [ "2a0c6d54dc34fdd8cca4e8ed7f39ad512133a878" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jan 20 00:31:46 2017 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jan 25 15:41:12 2017 -0800" }, "message": "Implement client code to use Drm and Crypto HALs\n\nThis change adds DrmHal \u0026 CryptoHal classes that connect to the Treble\nHAL interfaces for drm. These classes mirror the existing Drm and\nCrypto classes that connect to the DrmPlugin and CryptoPlugin\ninterfaces. Having both allows mediadrmserver to run in either mode\nwhile the HAL is stabilized.\n\nThe shared memory interfaces between mediaserver\u0027s ACodecBufferChannel\nand ICrypto had to be reworked to use the Treble HALs. Specifically,\nthe shared memory path for returning decrypted buffers in the\nnon-secure case had to become separate instead of piggy-backing on the\nsource shared memory buffer. A separate shared memory destination\nbuffer is now allocated on the buffer channel. An abstraction for a\ndecrypt destination buffer was also introduced to clarify ICrypto\u0027s\ndecrypt method.\n\nTests: Playback using Play Movies and ExoPlayer works on angler\nwith and without the treble hal enabled.\n\nbug: 32815560\nChange-Id: I5a3dc84f99902eb8cf8eabab9ad074d307744950\n" }, { "commit": "ce756ce2ce66c3d2246fc0798f84c97ebd8782a2", "tree": "4a18b5c30453beb48bdcb29f99f8f51601948e6a", "parents": [ "9c8086fa924e8b570fa66c3ef3bce0ec24a16031", "8a0470a12759dd77b73346c7caf11de8318c6d3c" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Sat Dec 10 00:49:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Dec 10 00:49:06 2016 +0000" }, "message": "provideKeyResponse to send an event to test AMediaDrm_setOnEventListener. am: 58a795ba81\nam: 8a0470a127\n\nChange-Id: Ibcacfe7d993354a2e395db3642239e5b038bb55d\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": "75571e4bc76bd2defd4309c7154120840396329d", "tree": "6011d30e202e4e6c03fdeffda65a9ad98ff2c131", "parents": [ "300379ab01ec4c5f9f538284dbb1e49ad012de29" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 07 16:34:52 2016 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 07 16:34:52 2016 -0800" }, "message": "Clean up mediadrm dependencies\n\nMove various things around so mediadrmserver doesn\u0027t need\nlibstagefright and libmedia\n\nTest: build/boot\nChange-Id: I48b713cd679b992cb6ad1262c20394a9892d7027\n" }, { "commit": "4f197ec220d2c9634429692dd37896233273111d", "tree": "9ee3410c97a0375f18e05a0728643cfe587f0edc", "parents": [ "68f9d0dc3b25c69eecccc9487319dd3343f0790b", "46d0a5b493dc7ef8cfd068c1b12d1d47d03d7884" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 04 22:52:20 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Nov 04 22:52:20 2016 +0000" }, "message": "Merge \"Remove unneeded links with dynamic libraries\"\nam: 46d0a5b493\n\nChange-Id: Ica6dd538c30b9aeccddad229cb24ade4d82d2e4c\n" }, { "commit": "263506542fbe480ddb247597bdcef16c437b48dd", "tree": "1ad06b1495a50534199f1aa5068b8519dd5d50c5", "parents": [ "712690b37495816a3f55e2d000f1f68caf1c20a4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 25 13:17:47 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 04 14:17:07 2016 -0700" }, "message": "Remove unneeded links with dynamic libraries\n\nVarious media components were linking against dynamic libraries that weren\u0027t needed.\n\nTest: built and booted\n\nChange-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e\n" }, { "commit": "c661ae6165338fd5f0bca50a63058b4bcd6def4b", "tree": "1fabefad176045b256eb3282f391b9e1ae4ee654", "parents": [ "bf2e61f54c7dcc37c97b4908c9ed6871cf3d2b49" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 25 13:17:47 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Oct 26 15:42:11 2016 -0700" }, "message": "Remove unneeded links with dynamic libraries\n\nVarious media components were linking against dynamic libraries that weren\u0027t needed.\n\nTest: built and booted\n\nChange-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e\n" }, { "commit": "9e27bc6c9c446814fa88bca98c1faa26c8d41fed", "tree": "a57bf14c3eb4fb72fdb0f69c818bb238f5b6c6e0", "parents": [ "8d8aec77e6e8a63dac4f9ad6327ba7f43881a25b" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 19 18:20:47 2016 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 19 18:20:47 2016 -0700" }, "message": "Fix memory leak in DRM framework\n\nThe listener member of a Drm object wasn\u0027t\nbeing released, causing memory to be leaked\nevery time a MediaDrm instance was created.\n\nbug:32277525\nChange-Id: I5582056fff3d20a5fd2b178bf028008d7f9ad1b4\n" }, { "commit": "e7557336920ca7e7d53e8ccc03d23359b41957af", "tree": "d9c490d2ba3d28176436b5d0374248322f0a349d", "parents": [ "aadc29b910a22c1d2b422d5a96faef07dfc97292" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Oct 17 15:12:12 2016 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Oct 17 15:23:03 2016 -0700" }, "message": "Remove executable bit from ordinary files\n\nTest: builds OK\nChange-Id: I7912c9c9c85dc500d33698fc174ba2a0db387407\n" }, { "commit": "5f5ee1110dd85001b43db7637a97474acfe8d681", "tree": "b9678c6154ad559ceb43989f832a105d11e38296", "parents": [ "c471bc541c7d43a91cc034ca67938b94324bfc56" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 15 16:13:48 2016 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Oct 05 11:42:19 2016 -0700" }, "message": "LOCAL_CLANG :\u003d true is now the default\n\nTest: verify that build has no failures\nChange-Id: Ib249b276c6295e55eb54fa37b6d15486415dfbed\n" }, { "commit": "b58c4e1bbd4e2420614e1bfe13f885e502301b63", "tree": "69082d9b5339a5746d291bb2e8f124295abf234c", "parents": [ "45c5d1a53534f6c41e369f09e4c77720bad28ca7", "16fbb20e739eba747c1d478a4bbcae47c7d7a421" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Sep 16 08:46:45 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 16 08:46:45 2016 +0000" }, "message": "Merge \"Stop including libcore/include/ in frameworks/av.\" am: adc9ba6520 am: c75164b942\nam: 16fbb20e73\n\nChange-Id: I751944e050b849e18c78857f64134ba54d0978eb\n" }, { "commit": "fb78341ae3a11b4c0356b393b6163f3e1258d7be", "tree": "5fbee9b91938bd347b5bfbbc1dbe6e99e839b086", "parents": [ "8a288e1fbd3b41ee555e2b6331b03e5f777f5711" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Sep 15 13:04:22 2016 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Sep 15 13:04:22 2016 -0700" }, "message": "Stop including libcore/include/ in frameworks/av.\n\nChange-Id: I7c0ffa84071c2080b5bfe2ce9ad7e1822fe863c7\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": "5cb96b83e6bff91a5ab006ff542dc32031be9087", "tree": "94fee5c9f5cb6130a87d0e4cecbae27dd5abd2be", "parents": [ "4d1522bdc7efaa9677ac92b620cea9e9110ec2a4", "f3d9908a888203e7e70b8c2d43ee741a95e154ed" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue May 24 20:41:03 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 24 20:41:03 2016 +0000" }, "message": "Merge \"Add memory heap checks for mediaserver and audioserver\" into nyc-dev\nam: f3d9908a88\n\n* commit \u0027f3d9908a888203e7e70b8c2d43ee741a95e154ed\u0027:\n Add memory heap checks for mediaserver and audioserver\n\nChange-Id: I8b5dda2e29da8651cbd9dbc77fa9ca6211b1a47d\n" }, { "commit": "07b745e166ee62030960ccea37e117caadf71c32", "tree": "a370227e0d195f58a4e7797d8a70933730970907", "parents": [ "d4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon May 23 16:21:07 2016 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon May 23 16:55:08 2016 -0700" }, "message": "Add memory heap checks for mediaserver and audioserver\n\nMemory heap check updated and restored to mediaserver,\nadded as new option to audioserver.\n\nRequires properties to be set (example for audioserver):\n\n$ adb shell setprop libc.debug.malloc.program audioserver\n$ adb shell setprop libc.debug.malloc.options backtrace\u003d8\n$ adb shell pkill audioserver\n\n...\n\nand to dump:\n\n$ adb shell dumpsys media.audio_flinger -m\n\nBug: 28909124\nBug: 27500825\nChange-Id: Ifa8c2c02b022daf1a799ee4a1d75282a3c921763\n" }, { "commit": "f64686f3b8c5100e114974038d0b2bb215d9bcd9", "tree": "c98f9a492583996ed4b134baa258d1909f2b06f0", "parents": [ "276b60e1be8ed92149411240d95705c642c7531a", "5405ce02c45b55c0ba12fd3131ae329506e91f94" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Thu May 19 19:12:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 19:12:38 2016 +0000" }, "message": "Merge \"Fix misc-macro-parentheses warnings.\" am: 64d4f64af0\nam: 5405ce02c4\n\n* commit \u00275405ce02c45b55c0ba12fd3131ae329506e91f94\u0027:\n Fix misc-macro-parentheses warnings.\n\nChange-Id: I94cd974549d819d7a43733636ecd4a6e464b76eb\n" }, { "commit": "92c6b825ad27e790b5ebd7076bd9b9ef3d5815ce", "tree": "5387cdb9c95cece74df22fc6485dfea62e0c3a3d", "parents": [ "0603c5dfc34923095218307674a60429bfa5873a" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue May 17 15:20:14 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue May 17 15:20:14 2016 -0700" }, "message": "Fix misc-macro-parentheses warnings.\n\nBug: 28705665\nChange-Id: I1ad468741c6f117817099d2ba87374dce2b776a9\n" }, { "commit": "4c0d6da0073e33d1c88ed52481f430ad68bd73ea", "tree": "dae010e49a9bad5dc209a4b316c95e598967534e", "parents": [ "5eb564afe15169c92504185e43e6c83888d67de7", "ecd0a41d9a2cc9efbc4ad6d4c91d417461772933" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Apr 28 09:46:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 09:46:18 2016 +0000" }, "message": "Merge \"Move system services into correct cpusets.\" into nyc-dev\nam: ecd0a41\n\n* commit \u0027ecd0a41d9a2cc9efbc4ad6d4c91d417461772933\u0027:\n Move system services into correct cpusets.\n\nChange-Id: I752b8b857ca94be20160ddebfb041aab0cca5fca\n" }, { "commit": "ecd0a41d9a2cc9efbc4ad6d4c91d417461772933", "tree": "64597a37b1444dcaef712e6fe6de1107b829baa9", "parents": [ "c5e8b6b792abd029e3f7fedf0ca2f705d6c8d222", "58f3e5541361cb04d64b8ad6a676ad0d77a4ee57" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Apr 28 09:34:56 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Apr 28 09:34:57 2016 +0000" }, "message": "Merge \"Move system services into correct cpusets.\" into nyc-dev" }, { "commit": "51ab9527d7427589e527d0dc8118d663926a8b68", "tree": "f75e953cb1431ab6eca9eb90226066b6de489bb3", "parents": [ "868ab87ae6b690815cebb2a4a9766ed6a894afff", "40601964e1f8966d90c31b0c389dfab6a515bd50" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 27 05:25:28 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 27 05:25:28 2016 +0000" }, "message": "Merge \"Remove MediaDrm stack from mediaserver\" into nyc-dev\nam: 4060196\n\n* commit \u002740601964e1f8966d90c31b0c389dfab6a515bd50\u0027:\n Remove MediaDrm stack from mediaserver\n\nChange-Id: I8d9fca7ed5d7bc2d9338dd9919ceef6631abd781\n" }, { "commit": "3003807fcfa96c9cbfea18d643f47108aa116cd5", "tree": "a3f7b454cdf3973b6fd716ee44f4295e6c100bb5", "parents": [ "c3c06c4fe329d07bd7d442206bc9eb63e92bf5bd" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 25 13:41:35 2016 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 26 20:46:17 2016 -0700" }, "message": "Remove MediaDrm stack from mediaserver\n\nPart of media security hardening\n\nMediaDrm was temporarily allowed to\nrun in either mediaserver or mediadrmserver\nwhile all nexus devices were implementing\nsupport for the native_handle representation\nof secure buffers. Now that all nexus\ndevices support native_handle, the MediaDrm\nstack can be removed from mediaserver.\n\nb/22990512\n\nChange-Id: Ie5d83bfeb4c4a824e1d0edb4c9452c782d6fd386\n" }, { "commit": "58f3e5541361cb04d64b8ad6a676ad0d77a4ee57", "tree": "c9141eb0d37fe71c38956b341840845e7d3a697c", "parents": [ "d298fb880ba440793ce206e5f519d4f7c8c8bb54" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Fri Apr 15 14:27:22 2016 +0200" }, "committer": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Tue Apr 26 08:48:12 2016 +0000" }, "message": "Move system services into correct cpusets.\n\nTo foreground:\n- cameraserver\n- mediaserver\n- audioserver\n- mediacodec\n- drmserver\n- mediadrmserver\n- mediaextractor\n\nBug: 24949295\nChange-Id: I182e5cf6fa4b33d87a0a2f77b0b03fa8d76b8e27\n" }, { "commit": "29906b24012386b9e90b71075de35a213bf8672f", "tree": "282a9ea783d622dc54e915f6f71e240ff654f47f", "parents": [ "9f0fdd1edd70ab31c3b7d9b687afb44e83b868b7", "118a465ca0b8cca90c5af3ccbe795e77998e97bf" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 13 00:30:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 13 00:30:49 2016 +0000" }, "message": "Merge \"libdrmframeworkcommon: Explicitly reference libbinder headers\" am: 3911d5d\nam: 118a465\n\n* commit \u0027118a465ca0b8cca90c5af3ccbe795e77998e97bf\u0027:\n libdrmframeworkcommon: Explicitly reference libbinder headers\n\nChange-Id: I9de4509fa1f24a18702f81c741bf5c1832328c1d\n" }, { "commit": "0572c6e6184cfc3a7fd2e1502b4d79a7f7ef76ad", "tree": "f09df3512369d1ca7fd86691df6f2f61a2a0b795", "parents": [ "9ca3b7a22fba08c3c1317472d6e1a1645eb2fd60" ], "author": { "name": "Christopher Wiley", "email": "wiley@google.com", "time": "Tue Apr 12 14:34:34 2016 -0700" }, "committer": { "name": "Christopher Wiley", "email": "wiley@google.com", "time": "Tue Apr 12 15:28:30 2016 -0700" }, "message": "libdrmframeworkcommon: Explicitly reference libbinder headers\n\nWhen creating this static lib, explicitly reference libbinder\nto pick up its header include paths.\n\nBug: 27804373\nTest: lib compiles when libbinder\u0027s header include\n paths change.\n\nChange-Id: I6cd034703db8ef13f0bcaece27373a60fcde7b4e\n" }, { "commit": "a1176a1ea1a4b21a46d961bbf208ff5eddfaaa26", "tree": "601fb9433dc3d688c857386b8043748eac7fa553", "parents": [ "1ab268e7b37aa919bfa72f557abb4f4be8451655", "30ecc7a6a439ed9eae622b30d7e0a978ad69a944" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 05 20:10:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 05 20:10:14 2016 +0000" }, "message": "Merge \"Fix SIGPIPE errors from drmserver\" into nyc-dev\nam: 30ecc7a\n\n* commit \u002730ecc7a6a439ed9eae622b30d7e0a978ad69a944\u0027:\n Fix SIGPIPE errors from drmserver\n\nChange-Id: I83f62aaa04096d0b17e8a5e225b6c1707a37a189\n" }, { "commit": "5a7ddf48cc8f181c5fba2d413f69f9ebf56c592f", "tree": "8cb122c00485ced2e7f6beb6acfaa25c089d6580", "parents": [ "2b7561f802bac06981dc46867d959e627085a8f7" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 04 23:19:20 2016 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 04 23:19:20 2016 -0700" }, "message": "Fix SIGPIPE errors from drmserver\n\nbug: 25284410\nChange-Id: If905bb2e6b9850698a22dbeec350c7356a7a8855\n" }, { "commit": "5f9a7eb465308a9c69c4aa1ff86e43290270ce41", "tree": "4b76a52651e9cc20e644d08d23e49f716314ff91", "parents": [ "b14a1051297ef80c918efdf2785cead2226f6099", "613aae14c6a7e3fe97b4de11165cf32b4e2326c3" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 04 21:35:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 04 21:35:49 2016 +0000" }, "message": "Merge \"Update how drm file descriptors are passed through framework\" into nyc-dev\nam: 613aae1\n\n* commit \u0027613aae14c6a7e3fe97b4de11165cf32b4e2326c3\u0027:\n Update how drm file descriptors are passed through framework\n\nChange-Id: I264883ef57c72d9c7b5a0ef86e791901a30c1eb9\n" }, { "commit": "2b7561f802bac06981dc46867d959e627085a8f7", "tree": "facf61edf27a99181794dd75081962c855d37b86", "parents": [ "172b675b5b24988e90ae39a0d6811789e06f7b74" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Apr 01 09:21:52 2016 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Apr 01 09:21:52 2016 -0700" }, "message": "Update how drm file descriptors are passed through framework\n\nbug: 26422357\nChange-Id: I1df2d08d432c17c703823617ee10dc181a9b9df7\n" }, { "commit": "b11a8649de8c029084c3628fc493f8032bae210f", "tree": "a2ff93bf1c29cb0889c528a65defb769b86da431", "parents": [ "c279308043d67b0e3c9d934e3951ae2750314c6c", "b5ab355f6cd5dc50ca1ff5418dddb318479749fb" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Thu Mar 31 14:30:37 2016 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Thu Mar 31 14:30:37 2016 -0700" }, "message": "resolve merge conflicts of b5ab355 to nyc-dev-plus-aosp\n\nChange-Id: Icd4ae55a3a3557b823dcdb2493fa4cc46951bbc7\n" }, { "commit": "5a8dbe7ad39fbfb9076894dcd24c596aae2cfccb", "tree": "905692e8a003731105ca9188e2eb4066b24f8070", "parents": [ "a9292e0651fae1ef26fa188b24a4a5d2d0a20c8f" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Jun 23 14:13:52 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Thu Mar 31 21:10:54 2016 +0000" }, "message": "drm: unused argument warning messages\n\nChange-Id: Ifd8a470ffa02f986427c5f36380d70494efe864d\n" }, { "commit": "c903684e9a8af5450bab61b0883fc81c5a466844", "tree": "04ac78614614acb27941e88babcce0d6e6595bc5", "parents": [ "56d65dc0b4574b1d29132b25c90c83a8fb203c9e" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Thu Feb 18 15:58:04 2016 -0800" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Fri Feb 19 14:33:08 2016 -0800" }, "message": "Fix the last warnings in frameworks/av/ drm code.\n\n- index is always positive so no need to check \u003e 0\n- args parameters are unused.\n\nBug: 27151704\nChange-Id: Ia4c23e1fc4eaef47f38526574b35ccfea9c92177\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": "c52ca479388f4b98da4a25850f552f9c54ccc1d2", "tree": "da9779554e95edb189c0755abc8833c095838b81", "parents": [ "661c5953f54848a37a012d9106af00e61bb98e08" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Fri Feb 12 13:10:19 2016 -0800" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Fri Feb 12 13:45:39 2016 -0800" }, "message": "Suppress unused parameter warnings in libdrmframework.\n\nThis change also enables -Werror flag that causes\nall warning to fail this target\u0027s build to prevent regressions.\n\nBug: 27151704\nChange-Id: I5d815d20aea151eb40292b8e2bffb144240413a2\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": "6ad1bce333a18d032e594bf99f12cbd6b2889be1", "tree": "79adaadbe4ca314d37c057c1e81fdf12083dfffb", "parents": [ "f0d7854e93696c4a10c98bc94d7b5f869c80493a" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Dec 01 08:50:36 2015 -0800" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Dec 01 08:50:36 2015 -0800" }, "message": "drmserver: add readproc group\n\ndrmserver need to be in the readproc group to access /proc files\nassociated with other UIDs, due to enabling hidepid\u003d2 in\nhttps://android-review.googlesource.com/181345\n\nBug: 25925909\nChange-Id: If477214a6cd598cebbe440a94aa1d58ea8f7114a\n" }, { "commit": "36af36b45d27888b4454134733cda44d040d726e", "tree": "b008aa4140cfff3e7da8c0dfe2d2138a40ca19aa", "parents": [ "71aaf985cf47b18165d2718c7a8a5f2b4956feef", "9a302c61b0159fed6545f689d4e9f2afde3dd7dd" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 21 22:02:13 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 21 22:02:13 2015 +0000" }, "message": "am 9a302c61: am 963522f9: am 2151d8f9: am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u00279a302c61b0159fed6545f689d4e9f2afde3dd7dd\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "2151d8f9ae667c53749e81a93f0ec0c60f3b8e05", "tree": "307f10d5342c2fcf823920ca7e0af2a38ee135f8", "parents": [ "3662ca1098676ed254dae8ffc014d60311d31b7e", "78f7932ddd8fed44a8fb421fcbf31f4ec1a82713" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 21 21:30:09 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 21 21:30:09 2015 +0000" }, "message": "am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u002778f7932ddd8fed44a8fb421fcbf31f4ec1a82713\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "78f7932ddd8fed44a8fb421fcbf31f4ec1a82713", "tree": "542a1f5c482f6997eacda70ba5ce8da7f55f7c2e", "parents": [ "d1cd259108cdc4abc192cb250ab15d03d3b76d96", "7b642b085413ffd92caa07933b21bc00b55f9905" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 21 21:06:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 21 21:06:45 2015 +0000" }, "message": "am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u00277b642b085413ffd92caa07933b21bc00b55f9905\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "0af5008096c9562f63808e37a60e5df150137526", "tree": "700f844f74c0005e7189792d38e95f41ef7e06b0", "parents": [ "24328843b09dbc5afe69e0834b5c72b277c0f8e6", "8ba28c840589bcc7fa4dfcb26606748a0c0b7eb5" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 21 18:57:36 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 21 18:57:36 2015 +0000" }, "message": "am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u00278ba28c840589bcc7fa4dfcb26606748a0c0b7eb5\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "d61dbb36a673a8278eb7d63e53215b2cff804f4b", "tree": "6efdac7ae1fbd0c061936214afe6c5111c0a8a31", "parents": [ "cc0942d0c2a57c5025063c62689ee01b39736dc2", "38281f1cbcd4804095828f19b7954d5219560fcd" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 16 18:40:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 16 18:40:49 2015 +0000" }, "message": "am 38281f1c: am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u002738281f1cbcd4804095828f19b7954d5219560fcd\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "38281f1cbcd4804095828f19b7954d5219560fcd", "tree": "05792b47baefede2d31c3b26fa6a76ab2dba32e3", "parents": [ "9860dcdf427d70e6aef4ce082be40a5459c466f4", "d386c5be9505d2db24048a6e08ab714f2151dac2" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 16 18:33:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 16 18:33:58 2015 +0000" }, "message": "am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u0027d386c5be9505d2db24048a6e08ab714f2151dac2\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "09ed70fab1f1424971ccc105dcdf5be5ce2e2643", "tree": "7cba0792014f79748c0fcc7c950cb4d6cc963403", "parents": [ "13ff64c2db84f4e7cac3396700e333b48c42c7ee" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 13:55:23 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 13:55:23 2015 -0700" }, "message": "Fix heap data leak vulnerability\n\nbug: 23600291\nChange-Id: I7979e9e25ada01c13775be8580d433a8b4ce4ffe\n" }, { "commit": "dc6d89a52807fc216012467dcba6091c608dae56", "tree": "f005da706f84464d6009595496d919a19a5e3226", "parents": [ "e6d2838dcb92a3277c59f4a13c4703b98b837bce", "9abb6302e30ed276cf36904bbf09697ccc065a1f" ], "author": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Fri Aug 21 18:24:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 18:24:24 2015 +0000" }, "message": "am 9abb6302: am f7ddd009: Merge \"bundle init.rc contents with its service\"\n\n* commit \u00279abb6302e30ed276cf36904bbf09697ccc065a1f\u0027:\n bundle init.rc contents with its service\n" }, { "commit": "c6dd768006362ced8ef7ae3606cac40312099fd7", "tree": "7d14c1f9bb07a565a0d00a9b032489ba7dbc216f", "parents": [ "d7c2effc0494a88b8b11ecf3c01f883b04c465e1" ], "author": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Fri Aug 14 13:01:03 2015 -0700" }, "committer": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Wed Aug 19 17:23:25 2015 -0700" }, "message": "bundle init.rc contents with its service\n\nBug: 23186545\nChange-Id: I18c6062f9e30d72e5a7ffd67c61b9eeec5c24e3b\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": "7cf1fe5df87e249557c87f5954d5dbbe310a618d", "tree": "ddd8f2e5e9b874aab6a512d42c5fcf821b3f6640", "parents": [ "9997183bc4e7fa11d35eeb8d58d27aa32a4140d5" ], "author": { "name": "Adam Langley", "email": "agl@google.com", "time": "Tue May 12 11:16:00 2015 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed May 13 22:11:15 2015 +0000" }, "message": "FwdLockConv.c: include what you use.\n\nThis file needs stdlib.h for malloc, free and realloc, but was\npreviously getting it only via the OpenSSL headers that it was\nincluding.\n\nBoringSSL, in the future, will be tider about what it includes via its\nheaders and so this file will need to include stdlib.h itself.\n\n(cherry picked from commit 2544611b6f37e69955fe7161995b7bacf3ae8fba)\n\nBug: 21085331\nChange-Id: I864c679ba5a9f0041dd49d063ad1190ffa87b30a\n" }, { "commit": "2544611b6f37e69955fe7161995b7bacf3ae8fba", "tree": "091344aa26255c41c285fc39b4d44cac22cb3aef", "parents": [ "eb1e82d71ec30eaad9e11f3b0dedef0d895035f8" ], "author": { "name": "Adam Langley", "email": "agl@google.com", "time": "Tue May 12 11:18:14 2015 -0700" }, "committer": { "name": "Adam Langley", "email": "agl@google.com", "time": "Tue May 12 11:18:14 2015 -0700" }, "message": "FwdLockConv.c: include what you use.\n\nThis file needs stdlib.h for malloc, free and realloc, but was\npreviously getting it only via the OpenSSL headers that it was\nincluding.\n\nBoringSSL, in the future, will be tider about what it includes via its\nheaders and so this file will need to include stdlib.h itself.\n\nChange-Id: Ic0ee43ed74ff96f1a57e6e153c65e80e0115c0e9\n" }, { "commit": "b408fa26c782c57272f11b46a235cca8c9ccb9be", "tree": "f3d7005298447009bcc2eb3b74c83221bc6feea4", "parents": [ "4275065e89b121fd2f9bd4e0440577348d5ce663" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 28 16:42:20 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 29 16:26:19 2015 -0700" }, "message": "Harden drmserver process against fuzzing attacks\n\nbug: 19572107\nChange-Id: I5ba0a434b016e8dc376f7d0eef5cf76b99ab50fd\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": "77e79a509d19ab50b1867fe3903b5a8fae450591", "tree": "881d068bdc54d4835665e48649165f07393caafa", "parents": [ "575174d62b665900203d70a4d410329b8918c2af", "e78a27ca9c701aa996eee0e47fa26dd69d80ffcf" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 17 10:50:55 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 17 10:50:55 2014 -0800" }, "message": "resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp\n\nChange-Id: If10a9cc17245f95d5e10b1507445abbb4020670e\n" }, { "commit": "f888020c6e2735624f2b2a30e72aca24e17b8b4d", "tree": "76d92b7a91a4bebd4e84d6afdc2ef4a2e4943df8", "parents": [ "d02641098b16df2fd4cd32b72a30eb6f3b64e12b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 14 07:58:25 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 17 10:05:07 2014 -0800" }, "message": "Update calls to IInterface::asBinder()\n\nto use the new static version.\n\nChange-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a\n\nConflicts:\n\tmedia/libmedia/IAudioFlinger.cpp\n\tmedia/libmedia/IMediaPlayer.cpp\n\tmedia/libstagefright/CameraSource.cpp\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": "b7ea09ab665fbf3f51d42f742e07d1bbd1c192c8", "tree": "67460b0003c2a94460f53bcfe557f6a8a176bdd9", "parents": [ "6200e7f43d977ad6698f018ee55e2f423ff8a87c", "3b97d9d787ba3913ce7e9b1e0ddd0b938e5bf979" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Nov 07 00:17:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 07 00:17:03 2014 +0000" }, "message": "am 3b97d9d7: am d556fad7: Fix build, update mock drm plugin\n\n* commit \u00273b97d9d787ba3913ce7e9b1e0ddd0b938e5bf979\u0027:\n Fix build, update mock drm plugin\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": "a4dd2e19f917f25b3eee36f499b126dc115e5446", "tree": "c11079e94ba87e90ddbe74322bfe9f41e042248d", "parents": [ "5fa013ea79066ec47589f38f94f557d021bd56eb", "7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Nov 06 02:49:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 06 02:49:11 2014 +0000" }, "message": "am 7ed62fb4: am 19a3f69d: Merge \"Add missing secure stop methods\" into lmp-mr1-dev\n\n* commit \u00277ed62fb4a7401adc3e8b4e082bcfa21de443ebbe\u0027:\n Add missing secure stop methods\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": "4fe73b54b4e44cee7ebed99fb171c1368298c5d9", "tree": "80fd6805076a1a7225bb94ccc419f15aeb24332c", "parents": [ "8e12cdf97f01b5774be555ad657f7290c0da18cd", "ac4d8b31d4c7785ccaed28977e05e158d554ce38" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Oct 07 23:23:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 07 23:23:16 2014 +0000" }, "message": "am ac4d8b31: am 6ade0417: Merge \"Remove dead code.\"\n\n* commit \u0027ac4d8b31d4c7785ccaed28977e05e158d554ce38\u0027:\n Remove dead code.\n" }, { "commit": "375c025bc668006f5e51a94665860d69a46433b0", "tree": "83c7a88e144f79c6dd5b24194c4170a875b717f3", "parents": [ "5bed74771daa5f0f8907aeb529d2ab0f388140b2", "ac4d8b31d4c7785ccaed28977e05e158d554ce38" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Oct 07 23:20:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 07 23:20:52 2014 +0000" }, "message": "am ac4d8b31: am 6ade0417: Merge \"Remove dead code.\"\n\n* commit \u0027ac4d8b31d4c7785ccaed28977e05e158d554ce38\u0027:\n Remove dead code.\n" }, { "commit": "f4a4c1da7e9d5086374216a6a57334b09c208f31", "tree": "2360e057a72fdffc045bbcb3349acbdf4f316cab", "parents": [ "ae38d425fdb3e3fea015c161d635d631172350c3" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Oct 07 13:55:27 2014 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Oct 07 13:55:27 2014 -0700" }, "message": "Remove dead code.\n\nBUG: 17364950\nChange-Id: I7c55fd918a8c0d1a3375807eaece9ae9176ffeea\n" }, { "commit": "d061bcd3f4bd99a909933937a72d6db926e3496e", "tree": "3781940ff3de1b33396913a01c60fe8e256c06b7", "parents": [ "677007ef5d1b6db2e57d0defa7afa28c19b693cb", "3a94ca562e6a57cf324a8b8165b596ad61f7a20d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Sep 26 19:53:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 26 19:53:07 2014 +0000" }, "message": "am 3a94ca56: am fc36efee: Merge \"Fix comparison of String8 to char* literal\"\n\n* commit \u00273a94ca562e6a57cf324a8b8165b596ad61f7a20d\u0027:\n Fix comparison of String8 to char* literal\n" }, { "commit": "d0eda851b7cb5566ac7078c73c3d3bde4d68d1b1", "tree": "3781940ff3de1b33396913a01c60fe8e256c06b7", "parents": [ "bedf4b8b4b971e480e671e0762da467cdcad7867", "3a94ca562e6a57cf324a8b8165b596ad61f7a20d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Sep 26 19:53:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 26 19:53:07 2014 +0000" }, "message": "am 3a94ca56: am fc36efee: Merge \"Fix comparison of String8 to char* literal\"\n\n* commit \u00273a94ca562e6a57cf324a8b8165b596ad61f7a20d\u0027:\n Fix comparison of String8 to char* literal\n" }, { "commit": "fc36efee6f6aefb561f92ef88c8eb40ac0aefa94", "tree": "a88ee8d8225c36bfa2e787e6f07b6e4720647191", "parents": [ "8f230382b86e7b431211ceb0263d06c4bba1bf6b", "f129e84addb1b0ba1240f39430404dad717c21c2" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Sep 26 17:06:39 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 26 17:06:39 2014 +0000" }, "message": "Merge \"Fix comparison of String8 to char* literal\"" }, { "commit": "6221547f1cef87c3ddea26a7936d01e33c9b4115", "tree": "87ca2a40d4a3fec80715a68ec4c67a7358fc9faf", "parents": [ "d20940ee9e9da7495a75569ccc513b4aa3ddc179", "9707ffaf0b574b7929d62b2fe683595e95ef7774" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Sep 22 20:10:57 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 22 20:10:57 2014 +0000" }, "message": "am 9707ffaf: am fd7e0440: Merge \"Check for NULL before calling asBinder().\"\n\n* commit \u00279707ffaf0b574b7929d62b2fe683595e95ef7774\u0027:\n Check for NULL before calling asBinder().\n" }, { "commit": "19ae665ba4139b7045897b3018f24b42f6fa2db7", "tree": "87ca2a40d4a3fec80715a68ec4c67a7358fc9faf", "parents": [ "0f14717a5b89d2b020682dba1804a13b225beae0", "9707ffaf0b574b7929d62b2fe683595e95ef7774" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Sep 22 20:10:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 22 20:10:01 2014 +0000" }, "message": "am 9707ffaf: am fd7e0440: Merge \"Check for NULL before calling asBinder().\"\n\n* commit \u00279707ffaf0b574b7929d62b2fe683595e95ef7774\u0027:\n Check for NULL before calling asBinder().\n" }, { "commit": "f129e84addb1b0ba1240f39430404dad717c21c2", "tree": "4e808b54b2013515a45031f46f3d368275d4a140", "parents": [ "14fc930d5d2ef272b39342fa083f4097464fc9ea" ], "author": { "name": "Bernhard Rosenkraenzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Thu Sep 18 21:17:29 2014 +0200" }, "committer": { "name": "Bernhard Rosenkraenzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Thu Sep 18 21:17:29 2014 +0200" }, "message": "Fix comparison of String8 to char* literal\n\nClang (correctly) interprets\n\nif (\".\" \u003d\u003d sName)\n\nas\n\nif (\".\" \u003d\u003d (const char*)sName)\n\nand recognizes that comparing the pointers isn\u0027t what was meant.\n\nWith\n\nif (sName \u003d\u003d \".\")\n\nboth clang and gcc see and use String8::operator\u003d\u003d(const char *),\nensuring we get the wanted behavior.\n\nChange-Id: Ide240e13214a56f6899f72de3db75dac647e6d4b\nSigned-off-by: Bernhard Rosenkraenzer \u003cBernhard.Rosenkranzer@linaro.org\u003e\n" }, { "commit": "12604519328867f11511b967565607971234c0ab", "tree": "bc2eb096fa3229d8be7b3ea902588ed299a09b27", "parents": [ "14fc930d5d2ef272b39342fa083f4097464fc9ea" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Sep 16 17:36:55 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Sep 16 17:36:55 2014 -0700" }, "message": "Check for NULL before calling asBinder().\n\nThe old asBinder() checked if this \u003d\u003d NULL, which is undefined behavior.\n\nChange-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c\n" }, { "commit": "58a07884861e3c28059cb5e452f79c274459aceb", "tree": "ef1c5779d47fb284b70dbfdc01d48e2de522772e", "parents": [ "11a4d099fd2cd3acf3de7210c0ef3e470254ebe8", "c2320223222fe4507b6d67f6b8b4001d26c77a9c" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 04 22:10:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 04 22:10:56 2014 +0000" }, "message": "am c2320223: Fix build break in mock drm plugin build\n\n* commit \u0027c2320223222fe4507b6d67f6b8b4001d26c77a9c\u0027:\n Fix build break in mock drm plugin build\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": "e2209ffea3f23bf711b732c6b3aa33320f2d2cc0", "tree": "0488a9238652ac87900a4f428942f2ee5a9b7753", "parents": [ "4ae6b2de588bdac03effd94b5ac33225ba0466c1", "b63d63b8afa25694d1973988d7acdfebcd01a18d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 04 20:56:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 04 20:56:24 2014 +0000" }, "message": "am b63d63b8: Merge \"Allow device to be unprovisioned\" into lmp-dev\n\n* commit \u0027b63d63b8afa25694d1973988d7acdfebcd01a18d\u0027:\n Allow device to be unprovisioned\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": "7045f37119f70c24eeea0624bfc8e25a2f9629a5", "tree": "664a25827a5345d3a2f5c73a4e818fac4f693c01", "parents": [ "1342065ac08f527769dde614c5e7c2980b56bf88", "bb5b41a39f7e93a8df444ae0a1c71495531d265e" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Jul 25 22:01:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jul 25 22:01:51 2014 +0000" }, "message": "am bb5b41a3: am a018cd49: Merge \"Add SELinux MAC to DrmManagerService.\"\n\n* commit \u0027bb5b41a39f7e93a8df444ae0a1c71495531d265e\u0027:\n Add SELinux MAC to DrmManagerService.\n" }, { "commit": "f785f497567ea9d55ade92cbf82a7e80eeb5cb82", "tree": "bd36d6320843cdb358ce79a6c3486919697ae594", "parents": [ "2e25819fffbb23d42541ead1bf735f3a02fa0330" ], "author": { "name": "Riley Spahn", "email": "rileyspahn@google.com", "time": "Tue Jul 01 15:32:31 2014 -0700" }, "committer": { "name": "Riley Spahn", "email": "rileyspahn@google.com", "time": "Fri Jul 25 13:25:51 2014 -0700" }, "message": "Add SELinux MAC to DrmManagerService.\n\nAdd SELinux checks on all interfaces exposed by the\nDrmManagerService.\n\nChange-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1\n" }, { "commit": "6868e986044a23cd3592f03b3937978175ebad53", "tree": "7a73fe45500e09bf55fdb3917c7b4f927b5a94a2", "parents": [ "0bffd2e60f644c8b8650c48d320c8cc22deb8ab6" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 17 16:45:46 2014 -0700" }, "committer": { "name": "Riley Spahn", "email": "rileyspahn@google.com", "time": "Fri Jul 11 09:18:11 2014 -0700" }, "message": "Fix Externally reported security issue\n\nbug: 12724697\nChange-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13\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": "b710094cc9fe5eaf4b00b091ba024e2a6837a7c3", "tree": "424038dc821e4b9b310051eeabfed3c30f590efe", "parents": [ "ab5cdbaf65ca509681d2726aacdf3ac8bfb6b3fa" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 17 16:45:46 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jun 20 10:12:12 2014 -0700" }, "message": "Fix Externally reported security issue\n\nbug: 12724697\nChange-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13\n" }, { "commit": "31dcd338b3826928646d77f23f977ecdd52598a3", "tree": "62bcf15eb7d991d0c9351c1cf35eb8f5a3887763", "parents": [ "47a2377ec07ad4ec06ecd25bfd45a37df91e68e6", "4299a7c2b049b07b3456a81a4c2b1030523c08ca" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jun 10 18:41:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 10 18:41:50 2014 +0000" }, "message": "am 4299a7c2: am 940f8be3: Merge \"Implement a NoOp DrmManagerClientImpl when no DRM service exists\" into klp-modular-dev\n\n* commit \u00274299a7c2b049b07b3456a81a4c2b1030523c08ca\u0027:\n Implement a NoOp DrmManagerClientImpl when no DRM service exists\n" }, { "commit": "4299a7c2b049b07b3456a81a4c2b1030523c08ca", "tree": "d3540220be0376ea8166a6d60941fd9ef753dc99", "parents": [ "cb3d3a365c91ed996c47dea6ff1490f2f13c1b52", "940f8be3619cecda66dad33f995904795df88c2d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jun 09 21:12:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 21:12:44 2014 +0000" }, "message": "am 940f8be3: Merge \"Implement a NoOp DrmManagerClientImpl when no DRM service exists\" into klp-modular-dev\n\n* commit \u0027940f8be3619cecda66dad33f995904795df88c2d\u0027:\n Implement a NoOp DrmManagerClientImpl when no DRM service exists\n" }, { "commit": "927634a98167e24241b89d80a1ea4511c0bb9cd1", "tree": "3ea03fe6cbbde8d9659015719881e51164e428e6", "parents": [ "e32106fd5175afdf939ae397aece9caf378a4912" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 04 15:14:03 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jun 06 13:44:55 2014 -0700" }, "message": "Implement a NoOp DrmManagerClientImpl when no DRM service exists\n\nChange-Id: Ib06f429102a51c540c8132f3397130328279e03a\n" }, { "commit": "1b24cf32e02a1372e57b3a2a432bc0adfe496e6d", "tree": "220f4583ae1081df62fa5c861eed3e9e90a24515", "parents": [ "4845b69f70ff457be8d8908f6eb61e2af67e00d3", "e80631aa1992ca50af679cd6a018c0ffda7f9b17" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 23:37:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 15 23:37:19 2014 +0000" }, "message": "am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027e80631aa1992ca50af679cd6a018c0ffda7f9b17\u0027:\n media: use size_t for integer iterator to Vector::size()\n media: 64 bit compile issues\n" }, { "commit": "e80631aa1992ca50af679cd6a018c0ffda7f9b17", "tree": "6b3fcc9fbb5b02976e4bb2163e994952303bead5", "parents": [ "d4a3cae8cc4cf924925ae57723e61c89f6c4fd51", "839d11d1f7be9dff2f06c7d30a9eb39cb6782078" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 22:35:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 15 22:35:00 2014 +0000" }, "message": "am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027839d11d1f7be9dff2f06c7d30a9eb39cb6782078\u0027:\n media: use size_t for integer iterator to Vector::size()\n media: 64 bit compile issues\n" }, { "commit": "3ab368e0810d894dcbc0971350c095049478a055", "tree": "a50053c391da8c02797158395f2ecfec83218855", "parents": [ "db43b34c3428e480f8c4c66e7e88f4001f37f91e" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:55:53 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:57:31 2014 -0700" }, "message": "media: use size_t for integer iterator to Vector::size()\n\nChange-Id: I0a744dc7815a86a993df9b0623440be620ec8903\n" }, { "commit": "99021c47f45ee8bf3317cff7d08226e76c8d8227", "tree": "5f8c264aefbb41cab611f5db8272c36827b9fa39", "parents": [ "118e7ff24af2e470ffed2bf7b37c9afa69afee92", "f356a123bf966150965a1af1cb9bd6ff2ca020de" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 01 22:23:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 01 22:23:23 2014 +0000" }, "message": "am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u0027f356a123bf966150965a1af1cb9bd6ff2ca020de\u0027:\n Support CAST V2 Authentication in MediaDrm\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" } ], "next": "37e05edf1cfe297f9c7d382787ecab53d5a2b5c8" }