)]}' { "log": [ { "commit": "32ec02978e0b9f943795070120c2eee04427802d", "tree": "8921758386dc7cbeed178634d925e35d9ce83756", "parents": [ "fa5e39ea568fc478d91abbb11062b982ad6f9617", "a19f43a1acbdfef34cb0b15486ebe5dc5fcba192" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 14 00:43:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 14 00:43:08 2020 +0000" }, "message": "Merge \"Update language to comply with Android\u0027s inclusive language guidance\" am: 4786a87b63 am: a19f43a1ac\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1399657\n\nChange-Id: Idf30bcb2c00ec3fd13f8c327757bd2818698b307\n" }, { "commit": "6cb494294a77195241c923c9792b6b0bdac67865", "tree": "e935bf4ca96db944d29486b20dcce04a70e5361f", "parents": [ "8debb9f333ed410669e3acbd0fb5cb7d694a2bad" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Aug 13 15:53:28 2020 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Aug 13 16:01:12 2020 -0700" }, "message": "Update language to comply with Android\u0027s inclusive language guidance\n\nSee https://source.android.com/setup/contribute/respectful-code for reference\n\nBUG\u003d161896447\n\nChange-Id: I0d42ed10f23013477f2dfba48b128ec13aef30ea\n" }, { "commit": "764b99146bca787bc9bc2a5ec65bc16022e8a34e", "tree": "f948f2a5e2972890864caad4893585f35a56d337", "parents": [ "8e8f437e2b0d764d472de2340139bb4166307a87", "6bfd4b99078edcb201563be278d4cc56ed574c83" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 28 21:25:47 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 28 21:25:47 2020 +0000" }, "message": "Merge \"Update language to comply with Android\u0027s inclusive language guidance\" am: b1f872ad71 am: 6bfd4b9907\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1373402\n\nChange-Id: Ief0873be6f7540f4b1c4e06eb0c375a5d9cf3237\n" }, { "commit": "b1fb801fd4f7a85d43fcf9a55b9a18c9425d4dc7", "tree": "f29d7197babe953cfa63a60972c17bad5a6fcccc", "parents": [ "3fd4dee8960cd6bccbb21227d43dfef839d33875" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Jul 27 16:00:03 2020 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Jul 27 16:00:03 2020 -0700" }, "message": "Update language to comply with Android\u0027s inclusive language guidance\n\nSee https://source.android.com/setup/contribute/respectful-code for reference\n\nBUG\u003d161896447\n\nChange-Id: I881d65531b38e62492fea4cc38ad9cdc01b4c692\n" }, { "commit": "f62ee0193ef91d52c36cc48e62e959720b9ad0f1", "tree": "e5626fd62dfb9caed47e31ab2cb566127972b272", "parents": [ "4bc9b54a526a212905b5da078f963e7246bd3ea0", "2137de3cbe83c4766df78a6cf1a0c1418ceebf3c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 01 19:24:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 19:24:37 2020 +0000" }, "message": "Merge \"Build 64-bit drmserver on 64-bit-only\" am: dbb9895007 am: 2137de3cbe\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1327534\n\nChange-Id: Ia2a980692889067e2dea82beacfff0e886dbf826\n" }, { "commit": "8c3cec4a48bad91320dfc2419ffa0dbb81d8f339", "tree": "01a35b58247a07beb79379c1a6f0f007350bb608", "parents": [ "b3c73bdb4f17ba09e892f4e001f3bcafe7d10461", "498c4ed2faa20036408a8790a90a3b2575976f6a" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Jun 28 04:10:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jun 28 04:10:01 2020 +0000" }, "message": "Merge \"clearkey hidl: fix oob read in decrypt\" into qt-dev am: a0ec467ed3 am: f4e931750a am: 498c4ed2fa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11348548\n\nChange-Id: I53a8babf0206f69051c6a655b08ad6a770197923\n" }, { "commit": "498c4ed2faa20036408a8790a90a3b2575976f6a", "tree": "5bac63897a390c1ddebec7eb45cf5d147472e16e", "parents": [ "1928cddbe98a24e173d1b83b870c67cd8f2deffb", "f4e931750a1b07d918f086e949770362105b9f51" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Jun 28 03:58:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jun 28 03:58:22 2020 +0000" }, "message": "Merge \"clearkey hidl: fix oob read in decrypt\" into qt-dev am: a0ec467ed3 am: f4e931750a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11348548\n\nChange-Id: I08526f43916411eda4844ed925db888cc4dbcc70\n" }, { "commit": "f4e931750a1b07d918f086e949770362105b9f51", "tree": "5104ea7b101c556e6985af635261ca76388efc96", "parents": [ "69279d9512d8ec04c5239bbca4ea080b65280e96", "a0ec467ed342e81bb6775bb437646ca8ef204e17" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Jun 28 03:45:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jun 28 03:45:54 2020 +0000" }, "message": "Merge \"clearkey hidl: fix oob read in decrypt\" into qt-dev am: a0ec467ed3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11348548\n\nChange-Id: Idbfa7c371c85ae50b6bf462ebcbb1adb18c23a96\n" }, { "commit": "092fe2524fbb638565f635f0b0eea43db1432f12", "tree": "27fc62124491d52331ffdb2b5200435fcc921f84", "parents": [ "f0bf3f27d2ab2876bb389bc3a22f5c37c227a366" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue Jun 09 11:41:15 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Thu Jun 25 09:49:58 2020 -0700" }, "message": "Build 64-bit drmserver on 64-bit-only\n\nBug: 158659480\nChange-Id: I56cd6df1889e8d479d3f05a3848070e93cff3745\n" }, { "commit": "69279d9512d8ec04c5239bbca4ea080b65280e96", "tree": "a517e5248e6397d2658c1edb6152826776799ae0", "parents": [ "15000df8f05fcaf5a0dab9a50e7e6657567d5b73" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Oct 08 01:08:07 2019 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Jun 03 17:47:23 2020 +0000" }, "message": "clearkey hidl: parsePssh securely\n\nBug: 137282168\nTest: drmpoc\nChange-Id: I480ee99778f8c774cb5b857b25c32d926270092d\nMerged-In: I480ee99778f8c774cb5b857b25c32d926270092d\n(cherry picked from commit 230f58c028f0840ee2aeabe5dd8e4eb800ecb2af)\n" }, { "commit": "4b5d5b6d576fddcb4dd19741a4573772fdab10d9", "tree": "b36449635521655f33d8bca3a24ff6f8935e13e5", "parents": [ "e5f6cd42a9f1e86a318e429fb9fdd956bcbcefe3", "ffba173b079322126ab38977fb86755bd438fbdd" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu May 14 01:59:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 14 01:59:38 2020 +0000" }, "message": "Merge \"Add tests for TreeHugger Presubmit.\" into rvc-dev am: ffba173b07\n\nChange-Id: Ifd5f9af36fb0f8d114b4ff135c19dd5979db8bdd\n" }, { "commit": "858b66a49378001041921a5d7053006abc9c0791", "tree": "9b040c9284915571a481b13bebe69d061b9a3d29", "parents": [ "38e65911a65a51edf2efd5ca63c4e00daac24852" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon May 04 16:11:35 2020 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed May 13 00:55:26 2020 +0000" }, "message": "Add tests for TreeHugger Presubmit.\n\nAdd presubmit tests to validate codec and drm changes in av/drm.\nAdd presubmit test to validate extractor changes in av/media/extractor.\n\nBug: 155319496\n\nTest: atest\n\nTests ran from frameworks/av/drm:\n arm64-v8a GtsExoPlayerTestCases\n -------------------------------\n [1/1] com.google.android.exoplayer.gts.DashTest#testWidevine23FpsH264Fixed: PASSED (02m11.176s)\n\n arm64-v8a GtsMediaTestCases\n ---------------------------\n [1/2] com.google.android.media.gts.WidevineGenericOpsTests#testL1: PASSED (38.363s)\n [2/2] com.google.android.media.gts.WidevineGenericOpsTests#testL3: PASSED (38.164s)\n\nTests ran from frameworks/av/media/extractor, add CtsMediaTestCases and\nGtsYouTubeTestCases:\n\n arm64-v8a CtsMediaTestCases\n ---------------------------\n android.media.cts (18 Tests)\n [1/18] android.media.cts.MediaDrmMetricsTest#testGetMetricsEmpty: PASSED (2ms)\n [2/18] android.media.cts.MediaDrmMetricsTest#testGetMetricsGetKeyRequest: PASSED (0ms)\n [3/18] android.media.cts.MediaDrmMetricsTest#testGetMetricsSession: PASSED (0ms)\n [4/18] android.media.cts.MediaDrmClearkeyTest#testClearKeyPlaybackCenc: PASSED (30.419s)\n [5/18] android.media.cts.MediaDrmClearkeyTest#testClearKeyPlaybackCenc2: PASSED (30.967s)\n [6/18] android.media.cts.MediaDrmClearkeyTest#testClearKeyPlaybackOfflineCenc: PASSED (30.688s)\n [7/18] android.media.cts.MediaDrmClearkeyTest#testGetNumberOfSessions: PASSED (76ms)\n [8/18] android.media.cts.MediaDrmClearkeyTest#testGetProperties: PASSED (51ms)\n [9/18] android.media.cts.MediaDrmClearkeyTest#testHdcpLevels: PASSED (25ms)\n [10/18] android.media.cts.MediaDrmClearkeyTest#testIsCryptoSchemeSupportedWithSecurityLevel: PASSED (25ms)\n [11/18] android.media.cts.MediaDrmClearkeyTest#testOfflineKeyManagement: PASSED (1.561s)\n [12/18] android.media.cts.MediaDrmClearkeyTest#testQueryKeyStatus: PASSED (1.711s)\n [13/18] android.media.cts.MediaDrmClearkeyTest#testReleaseOfflineLicense: PASSED (5.611s)\n [14/18] android.media.cts.MediaDrmClearkeyTest#testResourceContentionError: PASSED (51ms)\n [15/18] android.media.cts.MediaDrmClearkeyTest#testSecureStop: PASSED (1.610s)\n [16/18] android.media.cts.MediaDrmClearkeyTest#testSecurityLevels: PASSED (76ms)\n [17/18] android.media.cts.MediaDrmClearkeyTest#testSessionLostStateError: PASSED (126ms)\n [18/18] android.media.cts.MediaDrmClearkeyTest#testSetProperties: PASSED (51ms)\n\nChange-Id: I866283b649a60b11cd907f517e721a040be8c221\nMerged-In: I866283b649a60b11cd907f517e721a040be8c221\n" }, { "commit": "9adaa6b87f4834bc8fc5ead43466cf4d6099b871", "tree": "7a781d2fbab9261a041a7a47bc207b7b7bd5c6bc", "parents": [ "2c97e3371f0d33cf7805c48c4b89534841afc781" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 01 15:16:20 2020 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu May 07 18:45:34 2020 +0000" }, "message": "clearkey hidl: fix oob read in decrypt\n\nValidate sum of subsample sizes do not overrun source buffer.\n\nBug: 154123412\nTest: poc_CryptoPlugin_cpp_183\nTest: MediaDrmClearkeyTest\nTest: NativeMediaDrmClearkeyTest\nChange-Id: I27b05479202e0caedfd052c683aa1ef187f65679\n" }, { "commit": "f76edb9df96d63a33438e294ea0ece89e818ab9e", "tree": "44aec5d57e3908d0a038e6757b27ecddadb720e4", "parents": [ "47144e50c87f7eaf5468335f477ca4daae0866b4", "2ddee51ccfccd5d5de55d85dc6bf246ca4264121" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 08:26:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 28 08:26:02 2020 +0000" }, "message": "Merge \"Implement clearkey hidl `lshal debug` hook\" into rvc-dev am: 2ddee51ccf\n\nChange-Id: I5f1a62b1dfbba297752812163d1fe2b9b380f5db\n" }, { "commit": "2ddee51ccfccd5d5de55d85dc6bf246ca4264121", "tree": "0a72c4cf9ce6ce8dc8f8c15151254f151530d174", "parents": [ "2578a95a57dd9796b55095dc22b8171dd5da73c3", "452d91d674654f58c85fc010f659d0385a3fc5e4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 07:45:35 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 28 07:45:35 2020 +0000" }, "message": "Merge \"Implement clearkey hidl `lshal debug` hook\" into rvc-dev" }, { "commit": "452d91d674654f58c85fc010f659d0385a3fc5e4", "tree": "82ef4e043a106d249b9ac3534e029b0dcd3992c3", "parents": [ "02ec2d9d9a0040d4565e038a0291ca5b862a3a41" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 23 11:53:47 2020 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 27 20:44:45 2020 +0000" }, "message": "Implement clearkey hidl `lshal debug` hook\n\nThe output of the hook can viewed using the command:\n\u003e adb shell lshal debug android.hardware.drm@1.3::IDrmFactory/clearkey\n\nThe hook can be used to emit debug info from the ClearKey hidl process.\nCurrently only emit the total number of open sessions.\n\nBug: 153663446\nTest: adb shell lshal debug \\\n android.hardware.drm@1.3::IDrmFactory/clearkey\nChange-Id: Ie5918acbfbbb5cfc2a9bc5e138ab0320f3c6a558\n" }, { "commit": "0d1f20e6aca9d2f28b5a49496607898e659e2569", "tree": "dc6c2101e723981c01000f6cfd0afa51f6efddd5", "parents": [ "ac516165c4a93e6e52005b0004a4a3dd5a98e8d4", "8d2942ed96ec59adb80441428f75fba1c32129bf" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 23 23:50:03 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 23 23:50:03 2020 +0000" }, "message": "Merge \"Fix ClearKey session leaks\" into rvc-dev am: 8d2942ed96\n\nChange-Id: I59671411454e4bc436dff5bf400aa1283d2391e1\n" }, { "commit": "10111c263dc294008adb267d22d54f203bd28b95", "tree": "1aca4b8d2ae49099fa5b35c2b573515d4acd8dc8", "parents": [ "02ec2d9d9a0040d4565e038a0291ca5b862a3a41" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 23 11:57:25 2020 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 23 19:09:22 2020 +0000" }, "message": "Fix ClearKey session leaks\n\nDestroy sessions in following scenarios:\n* when setSecurityLevel fail in openSession_1_1\n* before handling mock errors in closeSession\n* after releasing offline keySetIds\n\nBug: 153663446\nTest: [Native]MediaDrmClearkeyTest\nTest: VtsHalDrmV1_\u003c0|1|2|3\u003eTargetTest\nChange-Id: I4357051e0be6daa199c5fc3e7505ce65d982e237\n" }, { "commit": "a23a7db45a12eafe242e9b53c34b99b9b9044045", "tree": "39e1b1c5d9ebda52823660dd05f3b5c676d4aeef", "parents": [ "a64d235e4755983d2d9668f6e5fde05b8db78cea", "a4cfeca69f76fbd2eedd6217b058d118844a5d4c" ], "author": { "name": "Juju Sung", "email": "juju.sung@mediatek.com", "time": "Thu Apr 16 17:18:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 16 17:18:55 2020 +0000" }, "message": "Support drm lazy hal am: a4cfeca69f\n\nChange-Id: I2e9bed94b2692ced22a84b1c6c8b132bddd771b4\n" }, { "commit": "a4cfeca69f76fbd2eedd6217b058d118844a5d4c", "tree": "6142f636d133028244ab1c3e49f48fa6ebd1e41c", "parents": [ "01d9c845f00cae661e1764162f36d5156871a60b" ], "author": { "name": "Juju Sung", "email": "juju.sung@mediatek.com", "time": "Fri Apr 10 15:02:32 2020 +0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Apr 15 15:33:46 2020 -0700" }, "message": "Support drm lazy hal\n\nUse listManifestByInterface in v1.2 servicemanager to list all\ninstances of drm service from the manifest. If it\u0027s lazy hal, the\nservice will be started as lazy hal service in getService.\n\nTest: Play secure video in ExoPlayer\nBug: 153636761\nChange-Id: Ifda4c9c433cfc1cd38980b10b8641f1db4460773\n" }, { "commit": "7e3df952b35cf0e904b510de249351e0bfdd6fda", "tree": "1e4cc909bdad6c5c950c0c1f7c7e53bcd3c29583", "parents": [ "36a2cd6811a8799a3531ba6de8a35ae64a8cfac1", "65328604dedbb0c01937efa0e831e62a191869f8" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Apr 06 23:09:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 06 23:09:29 2020 +0000" }, "message": "Merge \"MediaUtils: Move MemoryLeakTrackUtil.h to the proper library.\" into rvc-dev am: 65328604de\n\nChange-Id: I175282f183c65bbf6b71456645611be8b9a11bb5\n" }, { "commit": "e9eb03e9db8f66c711e2824e0f96d1fdc8f727b5", "tree": "77671b8d041a66b35884657fc4e05c5e5214787a", "parents": [ "95ec1b8ea487abbf4ef50d53c227338f559e9599" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Sat Apr 04 14:08:23 2020 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Apr 06 09:48:59 2020 -0700" }, "message": "MediaUtils: Move MemoryLeakTrackUtil.h to the proper library.\n\nTest: dumpsys sanity check of mediaserver, audioflinger, drmmanager\nBug: 149850236\nChange-Id: I7a3694444de0f940beacb699bc6f07ebb6a7cc7d\n" }, { "commit": "adb94e1712fdbc72b6d66c2013069ce93d04ce23", "tree": "19da3cd6cbdd97b09dcefcec8ad6b87734df1158", "parents": [ "208296d55296c42bbc9d1285bb7585807946db6a", "bbce5f0bd805808660dbf7faa099bd8455cd48a9" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Mar 27 05:19:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 27 05:19:15 2020 +0000" }, "message": "Merge \"IDrm: fix uninitialized variable in GET_OFFLINE_LICENSE_STATE\" into qt-qpr1-dev am: 2c652db6ef am: bbce5f0bd8\n\nChange-Id: Iaf1fb2d9caa39b4bd99459f5ab7da3c466cc6234\n" }, { "commit": "2c652db6efb758f7418895d3af2e69e6974bd36f", "tree": "6e496aeea4012ec339b97bf60dfca8431c3cdce5", "parents": [ "ae2c605380345aa2b08b9f78f16161a5cb9d6f7c", "bb907e884ad7fee3e7c4d8fa6df45fc2402b5c4a" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Mar 27 04:50:00 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 27 04:50:00 2020 +0000" }, "message": "Merge \"IDrm: fix uninitialized variable in GET_OFFLINE_LICENSE_STATE\" into qt-qpr1-dev" }, { "commit": "8a789559f59b98fc762033d2251735a4598e8711", "tree": "dac8a27afc3fb6f36fc38e7b27bc13cdf1f85bab", "parents": [ "26a47a1077f98c90f83f1301933ff28f9cc01511", "350456e99f623516347f1680501d8d2f33111fcd" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Mar 26 18:53:52 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 18:53:52 2020 +0000" }, "message": "Merge \"Check scopeId size in provideKeyResponse\" into rvc-dev am: 350456e99f\n\nChange-Id: Iaa97acec2d003af96e53f1236d5cad05c58508d0\n" }, { "commit": "58a1b32895aeb83109999c87062e46cb61776e60", "tree": "5420fdca9072434a6b5b8f29e19c3f2d94164e13", "parents": [ "4a56e5c5fd345e327fa317fcd72412746063ee7f" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Jan 06 12:55:31 2020 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Mar 26 16:42:14 2020 +0000" }, "message": "Check scopeId size in provideKeyResponse\n\nNeed to check scopeId size before access.\n\nBug: 144507096\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144507096\n\nMerged-In: I5d875f98e29c1115c156f7364c9c042426e17d7c\nChange-Id: I5d875f98e29c1115c156f7364c9c042426e17d7c\n(cherry picked from commit a9b9a30d3a764eddc6059cbc4d4ed60c64f55534)\n(cherry picked from http://go/ag/10026240)\n" }, { "commit": "40ac2f6b22375f13ba1dde2f8d6c08fbb8e3f0e8", "tree": "6e3c8d450d58dd46db340c159daaf13f6cbaf06a", "parents": [ "d37b50dfb74bb2924557849ada4ccbd51ea2f9ba", "9b7a9fcfa3051d116a19f25368fccd4a623fe72d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 25 02:20:19 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 25 02:20:19 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix Heap use after free in clearkey getSecureStops\" into qt-qpr1-dev" }, { "commit": "3d564ffd21230840801fd63fbc6a57a5fc723a4b", "tree": "dd5ea447d9b5bce5444405c24403c477a8513148", "parents": [ "9a788e15ec89d022d0c17f2513116304b189c0eb" ], "author": { "name": "Jooyung Han", "email": "jooyung@google.com", "time": "Sat Feb 22 00:46:06 2020 +0900" }, "committer": { "name": "Jooyung Han", "email": "jooyung@google.com", "time": "Mon Mar 23 16:11:42 2020 +0000" }, "message": "use vector\u003cuint8_t\u003e for byte[] in AIDL\n\nIn native world, byte stream is typically represented in uint8_t[]\nor vector\u003cuint8_t\u003e. C++ backend already generates that way. This\nchange involves NDK backend.\n\nNow NDK backend also uses vector\u003cuint8_t\u003e just like C++ backend.\n\nBug: 144957764\nTest: atest CtsNdkBinderTestCases\nMerged-In: Iffe188aa42f4f827ad4d021f06d85992db204c0d\nChange-Id: Iffe188aa42f4f827ad4d021f06d85992db204c0d\n(cherry picked from commit cfca116b0d2629a95172b5f822b27a549a478da5)\n\nExempt-From-Owner-Approval: cp from master to avoid merge-conflict\n" }, { "commit": "bb907e884ad7fee3e7c4d8fa6df45fc2402b5c4a", "tree": "abc61631640fe14997f6c6e29fd27366bbad0c30", "parents": [ "01102840bc362208e1ec2e8d50e10f460af158f1" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Mar 19 22:30:35 2020 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Mar 20 05:40:41 2020 +0000" }, "message": "IDrm: fix uninitialized variable in GET_OFFLINE_LICENSE_STATE\n\nBug: 146052771\nTest: drmServicePoc\nChange-Id: Ia34b9af4b6591812efcba0d9b67348c8b9a4dd3a\nMerged-In: I8e409e7048c9058f2d91ad2d467131f49e378259\n" }, { "commit": "fc62baf940babd28298ae51d0b282cb3be903739", "tree": "d75c3df26ab1049f30f93972ad0b7a9db2dceeb4", "parents": [ "28fc70a6cb4f90c5ff24873d41ad2320a4e7fc34" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Mar 13 21:49:06 2020 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Mar 15 01:38:02 2020 +0000" }, "message": "Remove DRM IResourceManagerClient on session close\n\nBug: 145889838\nTest: DrmSessionManagerTest\nTest: Youtube/Play Movies \u0026 `adb shell dumpsys media.resource_manager`\nChange-Id: I48a8001dbab25a0f4cc1afb15e071f22f1c6d7de\n" }, { "commit": "5421de844da60f56d9ad9fc353d74a4466c887f2", "tree": "7c3a9159425c4ff0ccc602072a09b65de9de4d4f", "parents": [ "859bcfc10ff9e1702d1bc7cfad066807b46db497", "a4a1c1bda256219e224ff42c3cc2f4b4c731602a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 21:22:05 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 21:22:05 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf am: d8d4e80384 am: 886419a51c am: a5d212cfee am: a4a1c1bda2\n\nChange-Id: I1f0701a0e09bed4297c96c6674c4ab092ef262f7\n" }, { "commit": "a5d212cfee978920684ad90f4b9bb3cfb3eeee8a", "tree": "3396efd92d4b21310a91cdcf6cb147907add6550", "parents": [ "67110b519a9c80e1bd9a7d6a45b91f1f478cee81", "886419a51c28003ad27ff89a9fcd0a4b3230df81" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:53:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:53:54 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf am: d8d4e80384 am: 886419a51c\n\nChange-Id: Ia148a19a53973c1d962a4146031174951f211049\n" }, { "commit": "886419a51c28003ad27ff89a9fcd0a4b3230df81", "tree": "88b5781497959c2bdaa627c9764ac1ce05e4c5f0", "parents": [ "f3f966faa6f46156726a338208f6c10a97d3fb4b", "d8d4e803842bed4188606856858189054a89c95c" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:40:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:40:49 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf am: d8d4e80384\n\nChange-Id: I61799ad95db7c74c031f633a6ec19c27f491bd4b\n" }, { "commit": "d8d4e803842bed4188606856858189054a89c95c", "tree": "07cbd892a9032ee2899f69abeaf200d0eb447d24", "parents": [ "509f1a5030ec005db387a4f0420af12e03d1b7f8", "245e44d9cfe008fcc460126f8992abf6c299a45c" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:29:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:29:38 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf\n\nChange-Id: I480db45b78b567a832d591df0834dbdae6cf88d0\n" }, { "commit": "245e44d9cfe008fcc460126f8992abf6c299a45c", "tree": "5aabfd0bcd9276de0d1c5f30373f8c4da27c6af9", "parents": [ "8d2c3d65d06bdf21a8fa4715352cb2a12a442579", "a9296786e36577a05de3f3500db0cdb2fabf13c0" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:01 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3\n\nChange-Id: I6518f72aab3fdfd0ec2e455708f3177a4966514e\n" }, { "commit": "a9296786e36577a05de3f3500db0cdb2fabf13c0", "tree": "667e5e739b038a789797ace35b68120e238e1110", "parents": [ "911b808a6568fee9c2fd1aa89039161195873350", "4bbfb6d8815002fc79b26aebba5f3ad2226c468e" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:05:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:05:08 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881\n\nChange-Id: I943db03ec26b3a7ec24636df46e2a21a472d52d2\n" }, { "commit": "15bf0cff2d92410cb41585a6f48d1406075c74f4", "tree": "1090f8e06041ae669227b3e2b207525f9f9f6f4b", "parents": [ "1bcb380cf7df86455842657d1356163f9b87e55c", "5802cd2e9685c8c88afa79bf7a46730821c15c0b" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 10 23:04:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 10 23:04:15 2020 +0000" }, "message": "Merge \"clearkey default: parsePssh securely\" into qt-qpr1-dev am: c7caded36e am: 5802cd2e96\n\nChange-Id: Ie6dbc26ca29e56b8f07bcf02f864e5f3f5ada4a7\n" }, { "commit": "4bbfb6d8815002fc79b26aebba5f3ad2226c468e", "tree": "958f89fe190c6ef2d9ddc3cc5fec4d6f0d28389f", "parents": [ "58af3de44d17e6ba716178e147474a20765c1441" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 04 17:23:58 2020 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Mar 10 13:29:13 2020 -0700" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN\n\nBug: 144767096\nTest: poc_ICrypto_283\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\nMerged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1\nChange-Id: If268553440b8a0cbbe011b5396974fd864a7d083\n" }, { "commit": "9b7a9fcfa3051d116a19f25368fccd4a623fe72d", "tree": "da856c1ebf642077fb486121a94f7313252cccb1", "parents": [ "a6544e3bf7de17f104d5fb509d6cb7f6d90dc79f" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 25 12:15:37 2019 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Mar 06 18:24:41 2020 +0000" }, "message": "[DO NOT MERGE] Fix Heap use after free in clearkey getSecureStops\n\nSecurity Vulnerability fix: Heap use after free in getSecureStops\nin android.hardware.drm@1.1-service.clearkey\n\nTest: adb shell ps | grep clearkey\n pid ID does not change after running drmpoc\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_07#testPocBug_137878930\n\nbug: 137878930\nMerged-In: I78b2dc2bccde238a06398b3733cea8e574ea8ee7\nChange-Id: I4fa2f0ad3f3360812987223f507a7394357080b3\n" }, { "commit": "8e3f56b7f281a775620a9a502384cc4d87d63dfc", "tree": "82c6a3c44feacf7699cd80b3e02d5bcebb57b53d", "parents": [ "4f74cca0d45df6af3027aa218f3d23c3ee36a451" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 16 10:25:23 2019 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Mar 04 20:32:24 2020 +0000" }, "message": "clearkey default: parsePssh securely\n\nBug: 137282168\nBug: 137370379\nTest: drmpoc\nChange-Id: Ic20a99b6b9fc661ead769217f88960571b5f68ad\nMerged-In: Ic20a99b6b9fc661ead769217f88960571b5f68ad\n(cherry picked from commit 1531cddad7c603fb530d1109463a1e8c03d515ff)\n" }, { "commit": "86f5034e60c62bbdc30634e7f0e54a6b91a19f72", "tree": "4856945522ee038351340509c5585fc8ec251fde", "parents": [ "0f97ee5a52d697e31e9c6dc3c9e7aa941168b571", "7bcf792dd843b0b69a04ae10e7b80e5bbfa62d94" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 19 18:31:29 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 19 18:31:29 2020 +0000" }, "message": "Merge \"DrmManager: locally aggregate API metrics\"" }, { "commit": "7bcf792dd843b0b69a04ae10e7b80e5bbfa62d94", "tree": "9ed2c26a9d41780ec241fa00d6dbe30e87354203", "parents": [ "93fb84c8d59eb3db95dd90bc34573b7c6c5b5b67" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Feb 07 15:01:57 2020 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 19 06:20:14 2020 +0000" }, "message": "DrmManager: locally aggregate API metrics\n\nAggregate DrmManager API invocation counts per plugin over at least\nfixed period of time before sending metrics to mediametrics service.\n\nThe default period is 1 day; the period is configurable through the\nproperty drmmanager.metrics.period.\n\nBug: 134789967\nTest: dumpsys media.metrics\nChange-Id: I2cf28f1dfaa485ca319360705b872eed995b3d7f\n" }, { "commit": "8f445de3d166f42e24e3cba4cac531e5365ac85a", "tree": "7145c6b53ffd15c0caecffbe4da35b89c7ead9e7", "parents": [ "a199662c6a891c009329b619782f2475dff60822", "e0496a2a4532590bb944192f9a561f4a48d07ab5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Feb 14 00:05:42 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 14 00:05:42 2020 +0000" }, "message": "Merge \"Use SharedRefBase::make to allocate.\"" }, { "commit": "e0496a2a4532590bb944192f9a561f4a48d07ab5", "tree": "ba0c2997034127f1e3ca92d80acd0223b2a0a5e3", "parents": [ "7e10198833432fe652f5343540bfb4430adb6713" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Feb 13 13:13:52 2020 -0800" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Feb 13 13:13:52 2020 -0800" }, "message": "Use SharedRefBase::make to allocate.\n\nSharedRefBase now encapsulates heap allocation in order to guard against\nsome types of double-ownership.\n\nBug: 149249948\nTest: TH\nChange-Id: Ida943c895225331a853e4c8da54454d60b17000a\n" }, { "commit": "6145557b52f4df703a439393d3600b4c88c14860", "tree": "1ac4edc77a4c84796e6ee6250351ebd4a84eb698", "parents": [ "8578b23f0d6a47677029eb3ed7a680476dc4baea", "42324f6aeff59b2f7eb02cc90ca19397792f4350" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:36:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:36:33 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e am: e492965229 am: cadf7289e0 am: 58cc8f2c02 am: 42324f6aef\n\nChange-Id: Id0fa49b3cf61b9e72a2477492d7317312740df36\n" }, { "commit": "58cc8f2c0254f03d66a28ae1cf0809c171d4ac7d", "tree": "4f272e8c6416bac5e87c2633b0d286ffd1c2d24e", "parents": [ "c25b042720672d0943dec638b8287ab80bedbf5d", "cadf7289e0dacf4a40422f0b36f97891649d398b" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:23:52 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:23:52 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e am: e492965229 am: cadf7289e0\n\nChange-Id: I27c1cd22dfa0e5ec371f636ef00e6bd121cc73b7\n" }, { "commit": "cadf7289e0dacf4a40422f0b36f97891649d398b", "tree": "c7dd4e1762048d401f9d6169e008bb66ce2c53f7", "parents": [ "1142d3ea289b03f2143b789e65fd174ea4854634", "e492965229ce184a76eaffe2d9fdfcf9e3db7af2" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:12:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:12:28 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e am: e492965229\n\nChange-Id: I66ee63192311c41c892747324b61368655da0db0\n" }, { "commit": "e492965229ce184a76eaffe2d9fdfcf9e3db7af2", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "df156dc766918c12b1931eb79919b4db3c959b1a", "d0d078020e26dd9ff1f870491bbfef0f9b9560de" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:59:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:59:54 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e\n\nChange-Id: I38c304066ea808014e288dd4ed6a2f89a34492cb\n" }, { "commit": "d0d078020e26dd9ff1f870491bbfef0f9b9560de", "tree": "2fcced65e527e9c934e8a424994a507150ae4f87", "parents": [ "f0791037c1676ecb6a4af39acabf33db02982545", "36af5d03196ce1ce41c753cdd63931072d2044ea" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:43:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:43:15 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319\n\nChange-Id: Ifa7bc3cd86f60b7fb0d557dbbad12dc7f5a1bcdb\n" }, { "commit": "36af5d03196ce1ce41c753cdd63931072d2044ea", "tree": "861aeab62263d1682d6b1528c06fc0b94a697510", "parents": [ "aca92198a127bb8a7d2e0ba9edcb52954bffcc24", "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:32:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:32:22 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8\n\nChange-Id: Ic58cdb7f33d8eb4acbae84a1fb6885341d177869\n" }, { "commit": "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc", "tree": "482e55c9c1c39b62df473fa54ea3ca65520c9a6a", "parents": [ "51aa2003766aa35d6c6b3ee688a86e117c65b94d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 11 20:21:05 2020 +0000" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 12 05:01:54 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\"\n\nThis reverts commit 51aa2003766aa35d6c6b3ee688a86e117c65b94d.\n\nReason for revert: DRM playback regression\n\nBug: 149067513\nChange-Id: I8d8a51efd57c52b444363ce5f5bd04316b2f4bb8\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\nMerged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1\n" }, { "commit": "cb3bd4065ccc7fd6a1613a45f708b5b9f612c61a", "tree": "ba2e12f802a48cf7d16ff4e160e59b8e9cec014a", "parents": [ "f2a9e40de1866cb2a66b8a67810ef34cb6c1465b", "2c37787ed7685c2dfaf659b4d2ffa4370279987f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Feb 08 05:08:51 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Feb 08 05:08:51 2020 +0000" }, "message": "Merge \"DrmUtils: return 1.3 hidl factories\"" }, { "commit": "2c37787ed7685c2dfaf659b4d2ffa4370279987f", "tree": "4e3474fcb778afe2e8927dc82adc6cde14772eb1", "parents": [ "b495377cac061d5856f0666b69bef42fdd244fb1" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Nov 24 22:17:46 2019 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Feb 06 06:54:55 2020 +0000" }, "message": "DrmUtils: return 1.3 hidl factories\n\nBug: 139134043\nTest: MediaDrmGenericOpsTest\nChange-Id: I0447758344432eff84bd5221e575f9dca3db56d4\n" }, { "commit": "06219a4467f8b79440525d1170fb92a6d89dbe2a", "tree": "8ba71c86b542d785a9826f5d9c17cf69288873d4", "parents": [ "4c8f695ecbdcbca36d00f981c1e8942022e8de55", "14dd42d061759b244240f87d1462938d1c82f5b4" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 01:07:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 01:07:24 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1 am: df156dc766 am: 86021896f0 am: 92b34e48ba am: 14dd42d061\n\nChange-Id: Iacc674dbc750cab71e6bd01d3cd0026576371d94\n" }, { "commit": "92b34e48ba6be4431351618f6409c52e51938545", "tree": "98a7b0ddc85d5f71ef7d8aa440d34f95da46b737", "parents": [ "7cf46ee5e75bc78fbaa8ec91bfb67d3b5e12019e", "86021896f0811062a47001b20f14bc29badf68e3" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:43:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:43:29 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1 am: df156dc766 am: 86021896f0\n\nChange-Id: Ia97c658b54e517e1bdbd911bba644e458a193e01\n" }, { "commit": "86021896f0811062a47001b20f14bc29badf68e3", "tree": "7f201d08c8e44a291da9563882041bd5bbe45d5b", "parents": [ "0ad729efbbe1951d4bad01eebea3843cb23b0420", "df156dc766918c12b1931eb79919b4db3c959b1a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:25:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:25:51 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1 am: df156dc766\n\nChange-Id: I6324e5f0b8be2a3c9dd0d7936fc8379c8daa8365\n" }, { "commit": "df156dc766918c12b1931eb79919b4db3c959b1a", "tree": "e7d769ee251bd8503fd9c23de72b5d65ba55bfd2", "parents": [ "d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb", "f0791037c1676ecb6a4af39acabf33db02982545" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:05:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:05:15 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1\n\nChange-Id: Iabb65b41883e0b46a7c0ea2e1a98accba1377eae\n" }, { "commit": "f0791037c1676ecb6a4af39acabf33db02982545", "tree": "a3ad8bf44e83cb5090efe266fba8725836cbf115", "parents": [ "6cf42dbae74a1237cf8861888f990280abbd6ef5", "aca92198a127bb8a7d2e0ba9edcb52954bffcc24" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:52:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:52:31 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1\n\nChange-Id: I19571d507f1234ece0d63542688063f087cf6bd7\n" }, { "commit": "aca92198a127bb8a7d2e0ba9edcb52954bffcc24", "tree": "5d1f140af64c3b4e00860ec902a3447f1509f0e9", "parents": [ "e545f3c8d3f02b80e0fb10c579510167be91da8b", "51aa2003766aa35d6c6b3ee688a86e117c65b94d" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:40:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:40:34 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376\n\nChange-Id: I8c30b0d77d2f5fae31afd7d1ed4cae194078630f\n" }, { "commit": "51aa2003766aa35d6c6b3ee688a86e117c65b94d", "tree": "b13d91733897c04147f067dfd9d9b68a69de0f37", "parents": [ "efd8f9e09a1333e85802e855bd15ceca8948baed" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 04 17:23:58 2020 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 05 18:56:51 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN\n\nBug: 144767096\nTest: poc_ICrypto_283\nChange-Id: Icd57367f8d912ff0a0cf9067c732b8fce169f29d\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\n" }, { "commit": "5277625231db4f313115fbcb6cefca7f2dfc2ce0", "tree": "288802a30819352b91c3b270329fb41b577928a0", "parents": [ "bccf38e3fa6bc2a372c3a0d38c6274b68c0e5fb7", "7c96ea7ff84e1084332548583841735b694bfebd" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Jan 25 03:44:28 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 25 03:44:28 2020 +0000" }, "message": "Merge \"Remove mediametrics include symlinks\"" }, { "commit": "d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "2587ab6c7642062ea1791de1868c28b1164a073c", "dc4c427b2155a9928a7cdaac7c0a787dd9c8192d" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:59:59 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:59:59 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into pi-dev" }, { "commit": "ac8a248341036148913169438fa362afc86cbc08", "tree": "8766be1e17957d99c0245873f99f7ae3055aab5d", "parents": [ "94ac050b2fd4f4af21003d7bd57c0a572a9afe36", "8464bfa975afe360bb8e3dd59c036ce4a4995fa8" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:59:20 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:59:20 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into qt-qpr1-dev" }, { "commit": "5b4757c2bb4359b7272d3bb85e0613d07871ddac", "tree": "427f1b0bdf86ce803c1b84f12bafc828c42dcc28", "parents": [ "63a3347443eeb35d5f73bf13dd882d67c09d03bc", "d81917505eda818d64135a8226a529b3901dee4b" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:58:58 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:58:58 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into qt-dev" }, { "commit": "9cb76c120169b52713e89ec37eb24c3166074d04", "tree": "002f8e2cd4ec01207b3f2dd9219eca0e96ea901c", "parents": [ "338209bb2f4cd5d0e4feea97d8003193102e17eb", "591f24cd32db96acffab727a3c6363d9fe203fdd" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:58:30 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:58:30 2020 +0000" }, "message": "Merge \"Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\"" }, { "commit": "84ff6cf52a613d5860102be95d87e5f818a70ef7", "tree": "4ebbb902af6a3b4b1cd7015c13e9b1776bbcb533", "parents": [ "2512a2757914dfea588917425aedc7ae4c606b66", "38d27e7b462c4b4ada2d21c63b29b31ac1a35c54" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 00:23:43 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 00:23:43 2020 +0000" }, "message": "Merge \"Fix heap buffer overflow for releaseSecureStops.\"" }, { "commit": "7c96ea7ff84e1084332548583841735b694bfebd", "tree": "eb5d7c1bcb91cea21469e46b7c014ae44635a217", "parents": [ "255f610f5ab71b5e36d93744dfe058daf6c96041" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jan 10 15:46:22 2020 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 16 15:55:18 2020 -0800" }, "message": "Remove mediametrics include symlinks\n\nBug: 143245419\nTest: build\nChange-Id: I6c836e60c0fe078f5ab7370aec156bdd6e8dcbf0\n" }, { "commit": "dc4c427b2155a9928a7cdaac7c0a787dd9c8192d", "tree": "853f066e1e6e5e271cc17315708f1033659fbb5c", "parents": [ "1d2cccfd2abecda52b49f123bf5905079578c542" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 17:56:17 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 16 22:52:46 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\n\nFix destPtr was not pointing to destination raw pointer.\n\nbug: 144506242\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242\n\nChange-Id: I9425baa21c82d5a5edf37c87989adbade0428b67\n" }, { "commit": "591f24cd32db96acffab727a3c6363d9fe203fdd", "tree": "7678a25fc1a18117e2ecdcc5663e03029f0f381a", "parents": [ "94e872e6894dce7d89954d0515c140ec626d20ba" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 17:45:33 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Jan 10 22:24:35 2020 +0000" }, "message": "Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\n\nFix destPtr was not pointing to destination raw pointer.\n\nmerge from qt-qpr1-dev: go/ag/9941940\n\nbug: 144506242\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242\n\nChange-Id: I9fb4ad350ec25dd697940fee57748652745a951d\n" }, { "commit": "d81917505eda818d64135a8226a529b3901dee4b", "tree": "87b5bba8ede0e6450906e62c18596dec8e30a357", "parents": [ "7b254210fe701b9023d1db342c6d1c884d39efe7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 14:37:57 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 16:08:40 2020 -0800" }, "message": "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\n\nFix destPtr was not pointing to destination raw pointer.\n\nbug: 144506242\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242\n\nChange-Id: Ifc9f3999e28c9216c476cab432248eb6c320de43\n" }, { "commit": "8464bfa975afe360bb8e3dd59c036ce4a4995fa8", "tree": "b7ba24ae51cb89ef4ae31af4bf023315d13b9c0a", "parents": [ "8f72d008d0c51da507fc3c447e68e02b9e2d8535" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 17:01:59 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 16:02:31 2020 -0800" }, "message": "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\n\nFix destPtr was not pointing to destination raw pointer.\n\nbug: 144506242\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242\n\nChange-Id: Ia1b8f755daaada2f1411abeb3cb5b832a72b3c82\n" }, { "commit": "a51151aacfc820122b45a875a0b6fe0dba60b756", "tree": "5250165a3a49942645caf75ade6634fa5c825e22", "parents": [ "bd9f1ed08bb948af54600eb60f13fd6e05068375" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 07 13:37:47 2020 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jan 08 11:21:31 2020 -0800" }, "message": "Link with actual headers instead of symlinks\n\nand remove the symlinks.\n\nBug: 143245419\nTest: build\nChange-Id: I70e450d9db0f65048f86391c4d3f341659cd213f\n" }, { "commit": "fa237c4f76b7b9369d9c499bfdc81e5072ddde86", "tree": "602110097b4e474c12c38c6cc635f746219e42e1", "parents": [ "8f72d008d0c51da507fc3c447e68e02b9e2d8535" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Nov 27 10:46:17 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 02:32:59 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.\n\nIf the input SecureStopRelease size is less than sizeof(uint32_t)\nin releaseSecureStops(), an out of bound read will occur.\n\nbug: 144766455\nbug: 144746235\nbug: 147281068\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455\n\nChange-Id: Ieccdd86ad86966fbf1dde70d3b3fb73d6dd124a4\n" }, { "commit": "b92e3bf778ab8dcf28193cfb63c40dd964644c47", "tree": "6264825f410a8c258c40002cedeb448869b1c2b4", "parents": [ "7b254210fe701b9023d1db342c6d1c884d39efe7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Nov 26 17:52:52 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 01:29:58 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.\n\nIf the input SecureStopRelease size is less than sizeof(uint32_t)\nin releaseSecureStops(), an out of bound read will occur.\n\nbug: 144766455\nbug: 144746235\nbug: 147281068\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455\n\nChange-Id: Ibee5a105eaedfee37d2fa93f7024f63f30cc7409\n" }, { "commit": "2587ab6c7642062ea1791de1868c28b1164a073c", "tree": "6c2e29839ae30177cc4b9e21b51a02159767fa33", "parents": [ "1d2cccfd2abecda52b49f123bf5905079578c542" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Nov 26 14:40:45 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 01:20:01 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.\n\nIf the input SecureStopRelease size is less than sizeof(uint32_t)\nin releaseSecureStops(), an out of bound read will occur.\n\nbug: 144766455\nbug: 144746235\nbug: 147281068\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455\n\nChange-Id: I050504c1ef4e5c41fb47ee97e98db41399288a91\n" }, { "commit": "38d27e7b462c4b4ada2d21c63b29b31ac1a35c54", "tree": "26bc94b26cee4fd4e9f8addc7ad3257db45ca34e", "parents": [ "f9cd09f66c901d68f4dc6b44876b87b98b640161" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Nov 25 19:06:28 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 01:19:10 2020 +0000" }, "message": "Fix heap buffer overflow for releaseSecureStops.\n\nIf the input SecureStopRelease size is less than sizeof(uint32_t)\nin releaseSecureStops(), an out of bound read will occur.\n\nbug: 144766455\nbug: 144746235\nbug: 147281068\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455\n\nChange-Id: I8c89797869addf83342a4f32e17bce0515713119\n" }, { "commit": "79673cfb78356afb4bb531d5f6fe115ab41930cc", "tree": "82f9a497a3221f4043e4af36f19abd4ee00fbb96", "parents": [ "c1a82b91f050f4b496b2d373046cb4c9fc32c8eb" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Sep 20 21:45:01 2019 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Dec 20 15:58:46 2019 +0000" }, "message": "Implement DrmSessionManager w mediaresourcemanager\n\nBug: 134787536\nTest: DrmSessionManagerTest\nTest: DrmSessionManager_test\nTest: ResourceManagerService_test\nChange-Id: Iab9f4f681c83f46b043cefc8633bb3e513a8e75a\nMerged-In: Iab9f4f681c83f46b043cefc8633bb3e513a8e75a\n" }, { "commit": "0ec6f56ea142285856dec8ac0ea35f3988621abc", "tree": "39064cf00995a7a1b3777887c2000e923ab24aa5", "parents": [ "3ae43b0ae940eb860fe03a4db6a17fefa155807a" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Sep 24 07:31:40 2019 -0700" }, "committer": { "name": "Sterling Huber", "email": "hubers@google.com", "time": "Thu Dec 19 22:10:47 2019 +0000" }, "message": "RESTRICT AUTOMERGE\nHarden Clearkey releaseSecureStops implementation.\n\nPerform more checking for invalid input.\n\nTest: CTS tests\n android.media.cts.MediaDrmClearkeyTest#testSecureStop\n android.media.cts.MediaDrmClearkeyTest\n\nTest: run drmpoc\n no signal 6 on clearkey service after the fix\n\nTest: adb shell ps | grep clearkey\n pid ID does not change after running drmpoc\n\nbug: 137284652\nChange-Id: I971bb33eec6d37ef86fa1a53501c1e6bda50fa3b\n" }, { "commit": "3ae43b0ae940eb860fe03a4db6a17fefa155807a", "tree": "12dd2c6f200e2b03742fc065f297146419e0a89b", "parents": [ "9ed54cdf4d8970bdeb88e4488dabb56e1d6c79b7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Sep 23 13:27:11 2019 -0700" }, "committer": { "name": "Sterling Huber", "email": "hubers@google.com", "time": "Thu Dec 19 22:09:09 2019 +0000" }, "message": "RESTRICT AUTOMERGE\nFix Heap buffer overflow in clearkey releaseSecureStops\n\nSecurity Vulnerability fix: Heap buffer overflow in clearkey\nreleaseSecureStops - android.hardware.drm@1.1-service.clearkey\n\nFix provided by researcher.\n\nTest: CTS tests\n android.media.cts.MediaDrmClearkeyTest#testSecureStop\n android.media.cts.MediaDrmClearkeyTest\n\nTest: run drmpoc\n no signal 6 on clearkey service after the fix\n\nTest: adb shell ps | grep clearkey\n pid ID does not change after running drmpoc\n\nbug: 137284652\nChange-Id: Id085945943aa6b85c597dc8b7c32a3b990c54a2b\n" }, { "commit": "fc3a56f69f48a1d2dfb311d8284a78987b578659", "tree": "714c91c85da2fa39f5671b4b46799b6c2115ab5d", "parents": [ "7d6d1ef2aaaf60061ed67749be217d3533cf985b", "12606bad3fbc6952c37a1f4d8108324d1a571132" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Dec 18 08:04:18 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 18 08:04:18 2019 +0000" }, "message": "Merge \"clearkey hidl: add 1.3 services\"" }, { "commit": "f27e987d277c186010e8bdd1d5e781158b31f9af", "tree": "87703f33fe40f06c2faa78daa4105bb6cb8db79d", "parents": [ "b7b870db0c6cc0c6375b154400a813b84f5056b4" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Sat Dec 07 06:28:46 2019 -0800" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Dec 17 11:20:57 2019 -0800" }, "message": "Naming consistency: MediaAnalytics to MediaMetrics\n\nBug: 145780674\nTest: build, boot, dumpsys media.metrics\nTest: atest mediametrics_tests CtsNativeMediaMetricsTestCases\nChange-Id: Icbfa98da9e61702aee9a1d807b5e126b4b9c6458\n" }, { "commit": "12606bad3fbc6952c37a1f4d8108324d1a571132", "tree": "9cfb93a98cc55f85ff2ccae445001aca1e28d900", "parents": [ "00a948515cf3829cf07adc47fbe6fdc95162458b" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Nov 26 22:23:23 2019 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Dec 12 14:32:24 2019 -0800" }, "message": "clearkey hidl: add 1.3 services\n\nBug: 139134043\nTest: MediaDrmTest\nChange-Id: I64bd6472c6fed1285abdeb010240c05be237ac44\n" }, { "commit": "a1ac5ba163abe071a658ce6ff466d0d8ab79848e", "tree": "d2eb0ae4b1cbc10bc159d92a1ea632736b14e211", "parents": [ "60569140248ff403db737c941c5a5274bcddb04a", "be926583c0ebd907fd40de0652c003036bb83a93" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Dec 03 17:33:03 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 17:33:03 2019 +0000" }, "message": "Merge \"Update clearkey plugin to drm HAL v1.3\"" }, { "commit": "e3c93d02f76fc8ba1628b1f4cdf271ce011b73d2", "tree": "1e742a37df116182a5886a33b88c607d26a1d641", "parents": [ "d054bb721892704815137cfd3d49d9f224dec76a", "d3f9ba74b185a4741f18e5c7878d7152e0e19f94" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Dec 03 00:17:40 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 00:17:40 2019 +0000" }, "message": "Merge \"libmediadrm: final libbinder cleanup\"" }, { "commit": "be926583c0ebd907fd40de0652c003036bb83a93", "tree": "979ecde66be00577fc73599b08de30ea50c21120", "parents": [ "ca933096569e99b3982094203a8efbac7604e29f" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Nov 24 12:17:33 2019 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Nov 28 10:04:50 2019 +0000" }, "message": "Update clearkey plugin to drm HAL v1.3\n\nThis CL implements IDrmFactory::getSupportedCryptoSchemes\n\nBug: 139134043\nTest: MediaDrmGenericOpsTest\nChange-Id: I4ed420e2f9285398548a3b87e9125be2671c613b\n" }, { "commit": "d3f9ba74b185a4741f18e5c7878d7152e0e19f94", "tree": "64251171614170138f7cc8ec7d2d1860ad0f58eb", "parents": [ "68a4a194e7e966acf572b16612bd097a1ad72550" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Nov 20 17:25:26 2019 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Nov 28 09:58:21 2019 +0000" }, "message": "libmediadrm: final libbinder cleanup\n\nBug: 134787536\nTest: build\nChange-Id: I7a0da8fdb1164486980bde835eb04089aaf78655\n" }, { "commit": "c0d1d0eeb4b94c13c8dd508b8136d8e1d95a59ac", "tree": "39fb8d37db955d523bf231ffcbf248b6109a4980", "parents": [ "0564f53084007a2358f95a9cb063befbf81a9d5a" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Nov 24 13:21:04 2019 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Nov 27 13:19:56 2019 -0800" }, "message": "DrmHal: use DrmUtils to create IDrmFactories\n\nBug: 134787536\nTest: MediaDrmClearkeyTest\nChange-Id: I7b269b6888b925f109b2a6a378fc15e675fc011a\n" }, { "commit": "935388159891146110e21e71cfce461b82b9f046", "tree": "1f3a3ea2eb6048786178c390d6307da51f37e9de", "parents": [ "b5d2afa23364d3f7f652f07f72d407c30116d226" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Nov 12 12:21:35 2019 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Nov 27 18:50:53 2019 +0000" }, "message": "libmediadrm: refactor bundle dependency\n\nBundle dependency now lives in DrmMetricsConsumer,\nwhich is part of the new libmediadrmmetrics_consumer.\n\nBug: 134787536\nTest: DrmMetrics_test\nChange-Id: I09b0981b6f97668c2572fb28d0e98de72068376b\n" }, { "commit": "88468e169aa02aec147006aa8de1e5468e253f4e", "tree": "8ae43df59ecb0e3bff0572c87f3a8f05529778a1", "parents": [ "7bda00681fb98c9e9635764d2147fd21aee1f8f2", "75e12cc76ba17bf37a73d3f4f04847c30e544167" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Nov 22 20:01:52 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 22 20:01:52 2019 +0000" }, "message": "Merge \"mediadrm: new IDrmMetricsConsumer interface\"" }, { "commit": "7bda00681fb98c9e9635764d2147fd21aee1f8f2", "tree": "ca124ce6bf756d979375f5b683398d3a4cfcc094", "parents": [ "afb3b8270a7d1c36998d39c1af4d6ead6e8f03d3", "6152d7c7eaf705bbc9481fff90672e7a62caf489" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Nov 22 18:27:20 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 22 18:27:20 2019 +0000" }, "message": "Merge \"DrmHal: remove permission check\"" }, { "commit": "6152d7c7eaf705bbc9481fff90672e7a62caf489", "tree": "d6b10fcbb311fa8b63ac1c52634112655bfa1052", "parents": [ "22a082cd73cc2708e232d9eaa8d59c6c8869f3b6" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Nov 19 22:54:27 2019 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Nov 21 23:01:02 2019 +0000" }, "message": "DrmHal: remove permission check\n\nPermission check should now be performed in HIDL HALs. The removed app-side\npermission check does not accomplish much because any app can communicate\nwith a Drm HIDL HAL directly.\n\nBug: 134787536\nTest: CastV2SignerTest\nChange-Id: I4d90effbc0a265459829c63e843b9a5d16e75359\n" }, { "commit": "5c65cc79f1f595d75834165e17ebe14d8b3288fe", "tree": "d3a8d55786181c245fd3d4d64b189ceacb8e5353", "parents": [ "d203cb92c9c9628b3bead45ec08f826544c1d649", "895fba9a4988dfc886d436c9eba2355608caa644" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Nov 21 22:58:16 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 21 22:58:16 2019 +0000" }, "message": "Merge \"ICrypto: use hidl memory instead of binder memory\"" }, { "commit": "895fba9a4988dfc886d436c9eba2355608caa644", "tree": "3eb656f2ca824aa0e0128389a0e25edf43ab9122", "parents": [ "5406f2634ce9d37f310f03f2af742b1f256c7c17" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Jul 16 16:29:44 2019 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Nov 21 18:28:22 2019 +0000" }, "message": "ICrypto: use hidl memory instead of binder memory\n\nBug: 134787536\nTest: GtsMediaTestCases\nChange-Id: Ib20600eac13c668c8dc6a964faad1874844e4026\n" }, { "commit": "22a082cd73cc2708e232d9eaa8d59c6c8869f3b6", "tree": "d2b1431f03226b35473b65c895df20346342dedd", "parents": [ "8aab9af295c7e4d9a503a3f11831e5b7e4d66a8a", "82ea6be9a7750feb6898b7146f286825e59c3e98" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Nov 20 20:16:42 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 20 20:16:42 2019 +0000" }, "message": "Merge \"mediadrm: use stable C interface to record metrics\"" }, { "commit": "8aab9af295c7e4d9a503a3f11831e5b7e4d66a8a", "tree": "79a154e01ebad93257c9b28bb829693695b1fca0", "parents": [ "6cd0b54b36b83922eb569d1cbcd6c0528d0ad8a1", "6d108731e7e233d7b0a0dfc416719727ba8a7966" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Nov 20 19:06:13 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 20 19:06:13 2019 +0000" }, "message": "Merge \"Remove IMediaDrmService\"" }, { "commit": "369b4e0cd1c37e4d1603a74dcf741800ba92ea16", "tree": "6346adfff465d2fbbc4d74035720791841761875", "parents": [ "68db3a07ae337de45b82c6e45d41c2c325f8e2dd", "0f3a8a0d989240412deab149e7383fb5277f3804" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Nov 20 19:06:13 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 20 19:06:13 2019 +0000" }, "message": "Merge \"DrmSessionManager: use ndk resourcemanager\"" }, { "commit": "68db3a07ae337de45b82c6e45d41c2c325f8e2dd", "tree": "eaceb9f109a077a76849185967100800a8e48aae", "parents": [ "2d05e23d5c6160e343a2d00f047883b830be0219", "b2b8453eedc91b220b3afb8121e95da4fa5080df" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Nov 20 09:04:11 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 20 09:04:11 2019 -0800" }, "message": "Merge \"Revert \"DecryptHandle cleanup\"\" am: 43251208e3 am: 290638a8f6\nam: b2b8453eed\n\nChange-Id: I9ab184f3766b2d20a0f548ad65fd519dce515682\n" }, { "commit": "290638a8f6c639d232395a19328f06244361e27d", "tree": "61bb5d956485f3e83bb422f947353c195183cfca", "parents": [ "a4f8c20bf985d4a6d3a108d6813fe01d5b41cd55", "43251208e388077681869d639d6d9210e277460d" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Nov 20 08:55:53 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 20 08:55:53 2019 -0800" }, "message": "Merge \"Revert \"DecryptHandle cleanup\"\"\nam: 43251208e3\n\nChange-Id: Ief6609328e84f298aa23b9fbc8fab7fa4651b7a2\n" }, { "commit": "81e1c008520d77adb180f5f58f5ed34b38dabaf7", "tree": "78df0ce9e680a06bbc567567d95a10ab111ea607", "parents": [ "a8129f7246dfb580158a002d06492c699183101c" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Nov 20 06:12:58 2019 -0800" }, "committer": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Nov 20 06:15:15 2019 -0800" }, "message": "Revert \"DecryptHandle cleanup\"\n\nThis reverts commit e75d74c70f125bddeb36e175de77e3b0461d1e48.\n\nTest: Local build completes\nBug: 144814133\n" }, { "commit": "493a55d11183402fd06315b32e640b7ce75abe63", "tree": "7c3f81d59f81868de9d6dedd12e07ff483e55457", "parents": [ "96dbc13015947e626402caea31ec45113b78cf62", "f2bb7b0ccc86a06deae882ac3974e2004eb98a27" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Nov 19 20:16:39 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 19 20:16:39 2019 -0800" }, "message": "Merge \"DecryptHandle cleanup\" am: a8129f7246 am: f1a372c179\nam: f2bb7b0ccc\n\nChange-Id: I028916e64c3635d33a5ef27a26c746513e75f23b\n" } ], "next": "f1a372c1792ad6b92a7cabd804a5195589daf8e0" }