)]}' { "log": [ { "commit": "8d214cd0b0b667b30b3f0f6021fcb5d7d95553d0", "tree": "04b405762548a52eac14b73c313fe97a42634cba", "parents": [ "7994267b2afe6f4d9eac15f2ad067e7ac2fef4da", "87e076681bbf79ae6dd6471cca8cb5661e3f0cc0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:51:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:51:41 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551\nam: 87e076681b\n\nChange-Id: I2d9124f3aa6a0ed072708c4c6a7e37f061a0a089\n" }, { "commit": "a64aff4551184706e379c14346c263df06b640e9", "tree": "cc7f61137e232353dba76bcf172210d6a4fb96c9", "parents": [ "425c7a42fb1a99e1b2f13c398b9fde555cd4c499", "fdfb9d206d2d8e5c58c3175064bff33ce562cbc6" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:39:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:39:40 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082\nam: fdfb9d206d\n\nChange-Id: I09b988c8906ccbabd7bc970d6a0be117e8b4b1df\n" }, { "commit": "7a22df06c3aea406dee1b8f31842001d89f2e6d6", "tree": "5bc7ce5d297353819a9854505b2c8384b290666a", "parents": [ "98a47295222edacfca74fcfd3310922e16224f6d", "d1a854a073f6c992fabac1fc79f7f3c002699491" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:16:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:16:09 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec\nam: d1a854a073\n\nChange-Id: I212669c64a748fed506b8b4a90a568aa91d01787\n" }, { "commit": "5250bc1becd741d06c534fdabb19227090e6523e", "tree": "89366462323c9d3b757ea69991ded18954c606fc", "parents": [ "8ff995a8ae93d19cf7bfa85844ed321de1a403eb", "eb21712f81aa9f6d5b055113595220ee1506f35c" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 06 19:05:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 19:05:36 2017 +0000" }, "message": "Fix integer overflow in mediadrmserver\nam: eb21712f81\n\nChange-Id: I0caf94590f85f444a4705f62792c27a447fa8b69\n" }, { "commit": "eb21712f81aa9f6d5b055113595220ee1506f35c", "tree": "8b7680cf16eac5079c70089c03ba95e93874ae03", "parents": [ "cbaad4b189c8566318bdb148cf905fe2b333b8ed" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jun 05 14:34:48 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jun 05 14:34:48 2017 -0700" }, "message": "Fix integer overflow in mediadrmserver\n\nbug:37710346\nChange-Id: If18cfb5bb1d1f1b2997d2a0e1685590d674181f4\n" }, { "commit": "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": "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": "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": "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": "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": "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": "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" }, { "commit": "37e05edf1cfe297f9c7d382787ecab53d5a2b5c8", "tree": "91985c91ec47023bbfe1ed0b94a8ed9bcb5af1db", "parents": [ "947237f67dd5335b26326a98fd7d3eae5fd7d702", "9a9481f89b26211b20d7f3fde3d54b455843bf70" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Mon Mar 17 23:32:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 17 23:32:11 2014 +0000" }, "message": "am 9a9481f8: am 0e7e5db7: Merge \"More 32-bit only\"\n\n* commit \u00279a9481f89b26211b20d7f3fde3d54b455843bf70\u0027:\n More 32-bit only\n" }, { "commit": "0e56849007a0f128201e545b610f119217b41376", "tree": "58e22c5f2fc8113c6e3fc185dbb8ca98dcf32f13", "parents": [ "089affb6c2d9ed1e2d49df4be02d30dc490506f9" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 14 15:36:20 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 14 17:25:04 2014 -0700" }, "message": "More 32-bit only\n\nChange-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36\n" }, { "commit": "9d79834400009f690d04726d2bb746a9e8281ede", "tree": "8578224331b4c701b977596ad2b914aa466b5496", "parents": [ "591d9a3652f868652ccc48dd9e9714f3a9813963", "e0a76795125a81471c408d4a23112e98ae2f0ae3" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 19:35:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 26 19:35:43 2014 +0000" }, "message": "am e0a76795: am 5969b408: Merge \"Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\"\n\n* commit \u0027e0a76795125a81471c408d4a23112e98ae2f0ae3\u0027:\n Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\n" }, { "commit": "f2d170f6790329dd73c61b8704055e1dff4112a2", "tree": "69d36b08bcac8aea963c5f6b022b8438b714d126", "parents": [ "8fc4d57d41f532b90187b9404a8ac705770d75b4" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "message": "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\n\nChange-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6\n" }, { "commit": "1d6fa7af1288b550faabe4ec2cf98684236723db", "tree": "a8801ca9a0925ba1faccf17acea4aa78d71a9d29", "parents": [ "b82a9f105f89d6b3684c9f626918042bd8977912", "566be7c33fc56ae4c34168ecbee5316374f7e3c5" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:47:53 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:53:20 2014 +0000" }, "message": "resolved conflicts for merge of 566be7c3 to master\n\nChange-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce\n" }, { "commit": "377b2ec9a2885f9b6405b07ba900a9e3f4349c38", "tree": "b938e1d75a1beefae86244f287ca22f4a277740d", "parents": [ "cdda7bf4d3ca9cad6979374a18dd5be79ea83d80" ], "author": { "name": "Kévin PETIT", "email": "kevin.petit@arm.com", "time": "Mon Feb 03 12:35:36 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 11:40:06 2014 +0000" }, "message": "Make frameworks/av 64-bit compatible\n\nContains the necessary changes to make frameworks/av build and work\non a 64-bit machine.\n\nSigned-off-by: Craig Barber \u003ccraig.barber@arm.com\u003e\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n\nChange-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43\n" }, { "commit": "9be49c915852b592a881be3905658e4fc698749d", "tree": "043ffa8d835b63a41af470fdb51d580774b0008e", "parents": [ "5f44635dc35814b98b4dc2b255355a93122fec59", "bb9e396d311ea38e958fb5b56efff7aea4eaed82" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jan 28 01:08:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 28 01:08:42 2014 +0000" }, "message": "am bb9e396d: am 06f7d151: am 06da69d5: Merge \"frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH\"\n\n* commit \u0027bb9e396d311ea38e958fb5b56efff7aea4eaed82\u0027:\n frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH\n" }, { "commit": "7d6fc5ebc8718ebb5bf505d9bda83ab63741a545", "tree": "3dff65731f7dcb75e20974287e8008c7048ca86f", "parents": [ "4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 24 21:00:32 2014 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jan 27 12:39:29 2014 -0800" }, "message": "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH\n\nLOCAL_MODULE_PATH doesn\u0027t work for multiarch builds, replace it\nwith LOCAL_MODULE_RELATIVE_PATH.\n\nChange-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e\n" }, { "commit": "817d4aa19e6a9c95ec20486e6d74dea5a38e7236", "tree": "e7d4814f283c3f27a9778e81bb4e222ee762c73d", "parents": [ "1dfca7775f0b8352a0fd6cfed1e70075e5fa4e75" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Nov 08 14:37:33 2013 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Nov 08 14:37:33 2013 -0800" }, "message": "Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.\n\nBug: 11534051\nChange-Id: I0ab56b0a96b30f721bcac1d1ccc6ca85c3271ef5\n" }, { "commit": "34486800a022857b45c3882624449980c5cb6907", "tree": "06e1a76a831666df008d5ba344b2c8e34bce27ef", "parents": [ "fe346c707f59d763ded93bc3d27b51f0c0408258" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 11 18:40:44 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 11 18:40:44 2013 -0700" }, "message": "Fix MediaDrm cts tests\n\nMoving the build of the mock MediaDrm plugin back to\nframeworks/av since it can\u0027t be installed by cts.\n\nb/10668350\n\nChange-Id: Id662bdb0775389b458f86a299392217f2d959422\n" }, { "commit": "4585e8f0ff47580fdb81ed8652bde32db1770050", "tree": "6aa5196aef1b75edc79199065ad825c26da64533", "parents": [ "e45a767e13fe3396185c9d378a70f7f11eb881d0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 30 23:05:00 2013 +0000" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Sep 03 10:15:01 2013 -0700" }, "message": "Revert \"Enhancement for OnInfo callback on DRM Framework\"\n\nThis reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62.\n\nFixes Fatal signal 6 (SIGABRT)\" when playing or downloading a video\nbug: 10542864\n\nChange-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca\n" }, { "commit": "ee7e77d55d510725a314d8ed36dc730c21af6173", "tree": "02b7cfa93dd77e7927b67cc6d85d865e3e6bd0c3", "parents": [ "8271f1a2225a34a0748624786392213a746c56d7" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 28 16:40:41 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 28 16:40:41 2013 -0700" }, "message": "fix MediaDrm.isCryptoSchemeSupported(uuid)\n\n1. Don\u0027t expect plugins to support an empty mimeType in isContentTypeSupported\n2. Move the cts test mock drm plugin to the cts tree so it is always used\n\nb/10528466\n\nChange-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1\n" }, { "commit": "5ff7836da0220b3097f36c8a5e82111816ebca62", "tree": "4612e1308d3dd9961db0fae6d3372203d5937f61", "parents": [ "62c1a46eec047eb5fbc4b90432ec1ce65b76fb75" ], "author": { "name": "Takeshi Aimi", "email": "takeshi.aimi@sonymobile.com", "time": "Wed Jul 11 17:09:21 2012 +0900" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 23 18:01:07 2013 -0700" }, "message": "Enhancement for OnInfo callback on DRM Framework\n\nIn DRM framework, plugins can transmit DrmInfoEvent to Java layer.\nAlthough DrmInfoEvent has several entries, current implementation\ncan only convey integer and String. This change enables plugins\nuto propagate a hashmap to Java layer. The hashmap can have\none or more Strings and one byte array as value.\n\nChanges are made by Sony Corporation.\n\nbug: 10459159\n\nChange-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7\n(cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)\n" }, { "commit": "9cf69e0fc110f17c28e988ed0f9bf91abfaf710d", "tree": "c5cb3fb67b26c852f8c7bea7e4eeb87952830842", "parents": [ "75c16dde986e16ac5fd4d34b06b0cc6a90679866" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 21 11:59:23 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Aug 22 09:27:35 2013 -0700" }, "message": "Add ability to test supported content types to MediaDrm\n\nbug: 10244066\nChange-Id: I317f05b146db962c271893f6208890a5a6c396f1\n" }, { "commit": "f355f18aa2cc1706761e373fe19298a9ccc9c75a", "tree": "72caa7cb946dd0de42de5dc30e83b5e99137485d", "parents": [ "20f4754b7e687d3718a0a0a585f2c9ac22e2567d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jul 22 15:54:42 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jul 23 11:32:15 2013 -0700" }, "message": "Remove obsolete drm manager code\n\nbug: 9545965\nChange-Id: Ia6e09efa826b1349d027045e782980daeb7d7596\n" }, { "commit": "423e33ce6569cb14ecf772e9670208517f7b30c4", "tree": "aa34178c7ba71151b4cb1a462da0679afcd37323", "parents": [ "f4c873a64db2d5d2d74ca596e7482627dd6b4238" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 08 15:23:17 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 16 23:01:17 2013 -0700" }, "message": "Added CTS test for secure stop APIs\n\nbug: 8604418\n\nChange-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365\n" }, { "commit": "da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6", "tree": "67aa5a912048834766759d1842f7e54a20f74481", "parents": [ "ec77122351b4e78c1fe5b60a208f76baf8c67591" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Apr 09 21:53:49 2013 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Apr 09 21:53:49 2013 -0700" }, "message": "Add liblog\n\nBug: 8580410\nChange-Id: If493d87d60d71be664ad75b140c62acadb75b0d0\n" }, { "commit": "c0d5f1f8405de861ed6f1725f26cd6601e7103ab", "tree": "710d03a7ee6541642c1dc16ac82b4ffea3903968", "parents": [ "4c63a239c404af1e055e5f9939939ab0fd09d98a" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 02 13:08:05 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 03 12:20:53 2013 -0700" }, "message": "Implement async event callout from drm plugin to Java app\n\nChange-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b\n" }, { "commit": "4c63a239c404af1e055e5f9939939ab0fd09d98a", "tree": "5ec5bdcc0de9cb139df551a2b6e5c6010497e9ac", "parents": [ "4fc3e841358164a661c78f78bc617f5ac879aa35" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat Mar 30 16:19:44 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 01 21:57:32 2013 -0700" }, "message": "MediaDrm API update\n\nClarify offline usage of sessions and keys and implement\nimplement CryptoSession to support additional crypto use\ncases.\n\nChange-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc\n" }, { "commit": "441a78d5e224e0d67f9b52fa9adc795c6944159b", "tree": "855eed2e1ee757c6019b6da9137d659fdc20fdcf", "parents": [ "c148e7a671c289f82f6ca40e29defcc43e1c6d0b" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Feb 08 10:18:35 2013 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Mar 13 13:39:48 2013 -0700" }, "message": "Implementing MediaDrm APIs\n\nChange-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6\n" }, { "commit": "558d60e4e2217e02b3e7adf7afaf51d1c6e08f91", "tree": "115bba1eb50a969fb98c1ece924ae7edb2d4df31", "parents": [ "2d45dbd1910a7e51d383e8583017e6f26cd3498a" ], "author": { "name": "Henrik B Andersson", "email": "henrikb.andersson@sonymobile.com", "time": "Sun Jul 15 07:46:29 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Jan 28 18:34:58 2013 -0800" }, "message": "Remove unnecessary lib dependencies in the FL makefile\n\nChange-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6\n" }, { "commit": "2d45dbd1910a7e51d383e8583017e6f26cd3498a", "tree": "260d8bd329b3e2004f7fb995a4a21d32588252f8", "parents": [ "0bf43848adb00922122b0a0eed2fa0318bde8317" ], "author": { "name": "Hung Nguyen", "email": "hung.nguyen@sonymobile.com", "time": "Tue Jun 05 13:19:53 2012 +0200" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Jan 25 16:25:18 2013 -0800" }, "message": "Fixed bugs where the content of buffer holding keys was cleared using a wrong size in forward lock\n\nModified by James Dong \u003cjdong@google.com\u003e\n\nChange-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5\n" } ], "next": "0bf43848adb00922122b0a0eed2fa0318bde8317" }