)]}' { "log": [ { "commit": "60ff0ca61c33347e58543c37beafc9817108ae45", "tree": "f07e5d8003c9b051a210f49994ebbf85c4f53db7", "parents": [ "a962bc6e2615c693e730af9e868801698fbf3772", "485a8bf69f05e36ec4f53256ab98626abeeaca02" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 24 05:34:41 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 24 05:34:41 2025 -0800" }, "message": "Merge changes from topic \"revert-3502139-revert-3500336-HUZKQGRTWV-COERBZPUTD\" into main am: 485a8bf69f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3501459\n\nChange-Id: I4d47aedad293d12eb1bb3677a34a7943879f0e68\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a962bc6e2615c693e730af9e868801698fbf3772", "tree": "9c5fc98a9e8d671ff34d3b1baed368f093bc8e85", "parents": [ "b73e8407bcedab29207499d10466862c254aebb0", "0dd52c888f88216dbf32e14fa7de192bb32e0e6e" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 24 05:34:38 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 24 05:34:38 2025 -0800" }, "message": "Revert^4 \"Mockito: Suppress errorprone error\" am: 0dd52c888f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3501458\n\nChange-Id: I15d2be1a7fe9abd7af2ae3d9f657dd59db21e477\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b73e8407bcedab29207499d10466862c254aebb0", "tree": "a060fc75066a1cc1ddf8675a057ef8a1e7dd4628", "parents": [ "ea0bd6a55d6abdfb7f51b779bc2e35c7e763bc6d", "aab2c7167755c758fe19410d4279f6d6eb6dcf37" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 24 05:34:35 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 24 05:34:35 2025 -0800" }, "message": "Revert^4 \"mockito: Add back removed FieldSetter\" am: aab2c71677\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3501457\n\nChange-Id: Ifedff134b21378f7be27ed4205d3b37c6a4ebd6c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ea0bd6a55d6abdfb7f51b779bc2e35c7e763bc6d", "tree": "ba22e083349e1bf7a8b9e2b423814369fb95ef7a", "parents": [ "22332bb6d6b72abb9e0abd496ffd326b8df15868", "b09b69f6c2741a4c8a1331e63266ada31e602ec8" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 24 05:34:32 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 24 05:34:32 2025 -0800" }, "message": "Revert^4 \"mockito: remove opentest4j dependency\" am: b09b69f6c2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3501456\n\nChange-Id: Ic7cd412f207668125d760cc8303dc949cc607b2f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "22332bb6d6b72abb9e0abd496ffd326b8df15868", "tree": "38bd5c951f3fd2d96e3901419d63593c4355a27d", "parents": [ "7001ac516ce29565494f6f1c6cd47e39c17ec818", "9fe92be95a4923a3be098320ce20cc512f24dfc1" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 24 05:34:27 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 24 05:34:27 2025 -0800" }, "message": "Revert^4 \"Upgrade mockito to v3.12.4\" am: 9fe92be95a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3501455\n\nChange-Id: I138d3614a7033d6bd2dc9356699bd5ef1ffc375f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "485a8bf69f05e36ec4f53256ab98626abeeaca02", "tree": "f07e5d8003c9b051a210f49994ebbf85c4f53db7", "parents": [ "da4f8e5626f755016252659dba09e4d85ce742b8", "a3f9f8a134b119df3c44526dbb74de3c9ef4d474" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 24 04:58:17 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 24 04:58:17 2025 -0800" }, "message": "Merge changes from topic \"revert-3502139-revert-3500336-HUZKQGRTWV-COERBZPUTD\" into main\n\n* changes:\n Revert \"Revert \"mockito: work around re-entrant stubbing of andr...\"\n Revert^4 \"Mockito: Suppress errorprone error\"\n Revert^4 \"mockito: Add back removed FieldSetter\"\n Revert^4 \"mockito: remove opentest4j dependency\"\n Revert^4 \"Upgrade mockito to v3.12.4\"\n" }, { "commit": "0dd52c888f88216dbf32e14fa7de192bb32e0e6e", "tree": "9c5fc98a9e8d671ff34d3b1baed368f093bc8e85", "parents": [ "aab2c7167755c758fe19410d4279f6d6eb6dcf37" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "message": "Revert^4 \"Mockito: Suppress errorprone error\"\n\n0c171d686485342f43b050c191cb3f84c54466c7\n\nChange-Id: If950741e5f70c0edc93fdc82eb6beaffc1b97d05\n" }, { "commit": "aab2c7167755c758fe19410d4279f6d6eb6dcf37", "tree": "a060fc75066a1cc1ddf8675a057ef8a1e7dd4628", "parents": [ "b09b69f6c2741a4c8a1331e63266ada31e602ec8" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "message": "Revert^4 \"mockito: Add back removed FieldSetter\"\n\n8e531c0964d7ed027185940a7b6a99b825bcd99d\n\nChange-Id: Id8fc681466fb2e0dfcf1f484c2be14365ddb2ecf\n" }, { "commit": "b09b69f6c2741a4c8a1331e63266ada31e602ec8", "tree": "ba22e083349e1bf7a8b9e2b423814369fb95ef7a", "parents": [ "9fe92be95a4923a3be098320ce20cc512f24dfc1" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "message": "Revert^4 \"mockito: remove opentest4j dependency\"\n\n688fc1ccdca102a4eb9a03f246c176d328c6dc46\n\nChange-Id: Ie7b5b6abdbe2e1a07350ebbe8c00a1397ca1457f\n" }, { "commit": "9fe92be95a4923a3be098320ce20cc512f24dfc1", "tree": "38bd5c951f3fd2d96e3901419d63593c4355a27d", "parents": [ "da4f8e5626f755016252659dba09e4d85ce742b8" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "message": "Revert^4 \"Upgrade mockito to v3.12.4\"\n\n7e23ff712f94f3a2616aed6692ca910f21755d3e\n\nChange-Id: I46813f90017ca5b85237406db0de6f07d0e29676\n" }, { "commit": "a3f9f8a134b119df3c44526dbb74de3c9ef4d474", "tree": "f07e5d8003c9b051a210f49994ebbf85c4f53db7", "parents": [ "0dd52c888f88216dbf32e14fa7de192bb32e0e6e" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Sun Feb 23 13:40:14 2025 -0800" }, "message": "Revert \"Revert \"mockito: work around re-entrant stubbing of andr...\"\n\nReapply \"Upgrade Mockito to v3.12.4\"\n\nReverted changes: /q/submissionid:3502139-revert-3500336-HUZKQGRTWV\n\nChange-Id: I20345d824796760ac154414bfb07e9623527b6a0\n" }, { "commit": "7001ac516ce29565494f6f1c6cd47e39c17ec818", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "80791742e5aa29a687ede992661cc5f32758f5e8", "da4f8e5626f755016252659dba09e4d85ce742b8" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Feb 19 17:07:00 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 19 17:07:00 2025 -0800" }, "message": "Merge changes from topic \"revert-3500336-HUZKQGRTWV\" into main am: da4f8e5626\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3502138\n\nChange-Id: I7b372af09a87a682546ea97b41e2c806c45050d2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "da4f8e5626f755016252659dba09e4d85ce742b8", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "457f110d9d011aa03863b30b134e5c15fce03e7d", "7e23ff712f94f3a2616aed6692ca910f21755d3e" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Feb 19 16:35:10 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 19 16:35:10 2025 -0800" }, "message": "Merge changes from topic \"revert-3500336-HUZKQGRTWV\" into main\n\n* changes:\n Revert^3 \"Upgrade mockito to v3.12.4\"\n Revert^3 \"mockito: remove opentest4j dependency\"\n Revert^3 \"mockito: Add back removed FieldSetter\"\n Revert^3 \"Mockito: Suppress errorprone error\"\n Revert \"mockito: work around re-entrant stubbing of android.os.P...\"\n" }, { "commit": "7e23ff712f94f3a2616aed6692ca910f21755d3e", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "688fc1ccdca102a4eb9a03f246c176d328c6dc46" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "committer": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "message": "Revert^3 \"Upgrade mockito to v3.12.4\"\n\n636f243cf723228dac2b19274112e88c115e365a\n\nChange-Id: I91be6e4cb9c646a46249e49ce029430fb1e3da4e\n" }, { "commit": "688fc1ccdca102a4eb9a03f246c176d328c6dc46", "tree": "38bd5c951f3fd2d96e3901419d63593c4355a27d", "parents": [ "8e531c0964d7ed027185940a7b6a99b825bcd99d" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "committer": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "message": "Revert^3 \"mockito: remove opentest4j dependency\"\n\n68d5d328913d63910b6d17644159b68d62258cbc\n\nChange-Id: I9b585f21ce5472d20d32a502dd317b67ece62b5f\n" }, { "commit": "8e531c0964d7ed027185940a7b6a99b825bcd99d", "tree": "ba22e083349e1bf7a8b9e2b423814369fb95ef7a", "parents": [ "0c171d686485342f43b050c191cb3f84c54466c7" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "committer": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "message": "Revert^3 \"mockito: Add back removed FieldSetter\"\n\n2d8b5e7c569a05e7d7f1ac1e450a6a2bbc0150b5\n\nChange-Id: I79fade2c101d6f39ab16083d5cf75db014ae1127\n" }, { "commit": "0c171d686485342f43b050c191cb3f84c54466c7", "tree": "a060fc75066a1cc1ddf8675a057ef8a1e7dd4628", "parents": [ "0aeaaf4675774a109edf37a14b4f71f34e19f61e" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "committer": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "message": "Revert^3 \"Mockito: Suppress errorprone error\"\n\n1c7797851aee3506182754580398f285b2b332c0\n\nChange-Id: Iee3ec1934b5ae592ee3cfe51e7501af235a85a91\n" }, { "commit": "0aeaaf4675774a109edf37a14b4f71f34e19f61e", "tree": "9c5fc98a9e8d671ff34d3b1baed368f093bc8e85", "parents": [ "5d3ed533bce483ee34e9203f5abb8ee35e5d2645" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 19 15:51:18 2025 -0800" }, "message": "Revert \"mockito: work around re-entrant stubbing of android.os.P...\"\n\nRevert submission 3500336\n\nReason for revert: Droidmonitor created revert due to b/397769063, b/397768983. Will be verifying through ABTD before submission.\n\nReverted changes: /q/submissionid:3500336\n\nChange-Id: Ia095cdc417572d9dba7daf46e91c5ee997e1c0ac\n" }, { "commit": "80791742e5aa29a687ede992661cc5f32758f5e8", "tree": "f07e5d8003c9b051a210f49994ebbf85c4f53db7", "parents": [ "9aaaeb27362c0c14faeb72494d71d91385f8d239", "457f110d9d011aa03863b30b134e5c15fce03e7d" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Feb 19 12:42:19 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 19 12:42:19 2025 -0800" }, "message": "Merge changes from topic \"revert-3499701-revert-3495771-upgrade-mockito-ONHERLZGCH-WJXLGYIWAH\" into main am: 457f110d9d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3500336\n\nChange-Id: Ib6162801636c877dcbbb0f0881bfc4a632acb2c5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "457f110d9d011aa03863b30b134e5c15fce03e7d", "tree": "f07e5d8003c9b051a210f49994ebbf85c4f53db7", "parents": [ "6ad913a225a6c171345bba08ff425ad47f7f6cba", "5d3ed533bce483ee34e9203f5abb8ee35e5d2645" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Feb 19 12:00:43 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 19 12:00:43 2025 -0800" }, "message": "Merge changes from topic \"revert-3499701-revert-3495771-upgrade-mockito-ONHERLZGCH-WJXLGYIWAH\" into main\n\n* changes:\n mockito: work around re-entrant stubbing of android.os.Process\n Revert^2 \"Mockito: Suppress errorprone error\"\n Revert^2 \"mockito: Add back removed FieldSetter\"\n Revert^2 \"mockito: remove opentest4j dependency\"\n Revert^2 \"Upgrade mockito to v3.12.4\"\n" }, { "commit": "5d3ed533bce483ee34e9203f5abb8ee35e5d2645", "tree": "f07e5d8003c9b051a210f49994ebbf85c4f53db7", "parents": [ "1c7797851aee3506182754580398f285b2b332c0" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Feb 19 16:22:38 2025 +0100" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Feb 19 07:35:02 2025 -0800" }, "message": "mockito: work around re-entrant stubbing of android.os.Process\n\nLibcore\u0027s Arrays.ArrayList.toArray() checks the current process\u0027 enabled CompatChanges.\nTo avoid that causing an infinite recursion, dispatching to Process must\nnot invoke addAll(), which for some implementation uses List.toArray().\n\nInstead, we directly add the array.\n\nFixes: 397508359\nTest: atest SdkSandboxUnitTests\nChange-Id: I7873c19feb72e858f6a45ed02256cda601d05408\n" }, { "commit": "1c7797851aee3506182754580398f285b2b332c0", "tree": "9c5fc98a9e8d671ff34d3b1baed368f093bc8e85", "parents": [ "2d8b5e7c569a05e7d7f1ac1e450a6a2bbc0150b5" ], "author": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "committer": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "message": "Revert^2 \"Mockito: Suppress errorprone error\"\n\n2a1e849b540be98219d43f211937bb74b53d2e14\n\nChange-Id: I462f1003dfd7777bc857aab1e42b8b91fe25f9ca\n" }, { "commit": "2d8b5e7c569a05e7d7f1ac1e450a6a2bbc0150b5", "tree": "a060fc75066a1cc1ddf8675a057ef8a1e7dd4628", "parents": [ "68d5d328913d63910b6d17644159b68d62258cbc" ], "author": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "committer": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "message": "Revert^2 \"mockito: Add back removed FieldSetter\"\n\n4feae0bb6dd27b06cd1b2e34a3d7e0549bd2c9c4\n\nChange-Id: Ifc5c4ccd532cd3bae684c57bdecbe02606b860d3\n" }, { "commit": "68d5d328913d63910b6d17644159b68d62258cbc", "tree": "ba22e083349e1bf7a8b9e2b423814369fb95ef7a", "parents": [ "636f243cf723228dac2b19274112e88c115e365a" ], "author": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "committer": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "message": "Revert^2 \"mockito: remove opentest4j dependency\"\n\ne3b63d0b0058fd9dfb5b2cf51d954899f25a31a7\n\nChange-Id: I985afa9a8b9b2d4d8cdf66d0e891bd063cca5c55\n" }, { "commit": "636f243cf723228dac2b19274112e88c115e365a", "tree": "38bd5c951f3fd2d96e3901419d63593c4355a27d", "parents": [ "6ad913a225a6c171345bba08ff425ad47f7f6cba" ], "author": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "committer": { "name": "Android Culprit Assistant", "email": "boq-android-culprit-assistant@system.gserviceaccount.com", "time": "Wed Feb 19 05:37:59 2025 -0800" }, "message": "Revert^2 \"Upgrade mockito to v3.12.4\"\n\na4f5c77a767e8507843a45369a97d38b6d4d6c98\n\nChange-Id: Iea56e46fd08f1a1f6a23788b81599958d35bd5f5\n" }, { "commit": "9aaaeb27362c0c14faeb72494d71d91385f8d239", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "e1b5d3fa262eb3997f77847c31312ac1caa33552", "6ad913a225a6c171345bba08ff425ad47f7f6cba" ], "author": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 16:20:47 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 18 16:20:47 2025 -0800" }, "message": "Merge changes from topic \"revert-3495771-upgrade-mockito-ONHERLZGCH\" into main am: 6ad913a225\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3499704\n\nChange-Id: I28e515f5b5e5de3907e730bae2fd67eef6e4f60f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ad913a225a6c171345bba08ff425ad47f7f6cba", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "9c8cc4d25424d49135596041970b9f0c9163ee8f", "a4f5c77a767e8507843a45369a97d38b6d4d6c98" ], "author": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:44:26 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 18 15:44:26 2025 -0800" }, "message": "Merge changes from topic \"revert-3495771-upgrade-mockito-ONHERLZGCH\" into main\n\n* changes:\n Revert \"Upgrade mockito to v3.12.4\"\n Revert \"mockito: remove opentest4j dependency\"\n Revert \"mockito: Add back removed FieldSetter\"\n Revert \"Mockito: Suppress errorprone error\"\n" }, { "commit": "a4f5c77a767e8507843a45369a97d38b6d4d6c98", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "e3b63d0b0058fd9dfb5b2cf51d954899f25a31a7" ], "author": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:38:40 2025 -0800" }, "committer": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:38:40 2025 -0800" }, "message": "Revert \"Upgrade mockito to v3.12.4\"\n\nRevert submission 3495771-upgrade-mockito\n\nReason for revert: DroidMonitor: Potential culprit for http://b/397508359 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\nReverted changes: /q/submissionid:3495771-upgrade-mockito\n\nChange-Id: I80962a58d380d09aa86438627decf9befc3d7de0\n" }, { "commit": "e3b63d0b0058fd9dfb5b2cf51d954899f25a31a7", "tree": "38bd5c951f3fd2d96e3901419d63593c4355a27d", "parents": [ "4feae0bb6dd27b06cd1b2e34a3d7e0549bd2c9c4" ], "author": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:38:40 2025 -0800" }, "committer": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:38:40 2025 -0800" }, "message": "Revert \"mockito: remove opentest4j dependency\"\n\nRevert submission 3495771-upgrade-mockito\n\nReason for revert: DroidMonitor: Potential culprit for http://b/397508359 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\nReverted changes: /q/submissionid:3495771-upgrade-mockito\n\nChange-Id: I8d71a5af9d9dda1e39c3e9c3af86166e9da8573e\n" }, { "commit": "4feae0bb6dd27b06cd1b2e34a3d7e0549bd2c9c4", "tree": "ba22e083349e1bf7a8b9e2b423814369fb95ef7a", "parents": [ "2a1e849b540be98219d43f211937bb74b53d2e14" ], "author": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:38:40 2025 -0800" }, "committer": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:38:40 2025 -0800" }, "message": "Revert \"mockito: Add back removed FieldSetter\"\n\nRevert submission 3495771-upgrade-mockito\n\nReason for revert: DroidMonitor: Potential culprit for http://b/397508359 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\nReverted changes: /q/submissionid:3495771-upgrade-mockito\n\nChange-Id: I910a6780f3302369ab910df652cb0965d6f8c9b7\n" }, { "commit": "2a1e849b540be98219d43f211937bb74b53d2e14", "tree": "a060fc75066a1cc1ddf8675a057ef8a1e7dd4628", "parents": [ "31b873ade51e54413c46d1dd7dbc7cb46dbc9589" ], "author": { "name": "Liana Kazanova (xWF)", "email": "lkazanova@google.com", "time": "Tue Feb 18 15:38:40 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 18 15:38:44 2025 -0800" }, "message": "Revert \"Mockito: Suppress errorprone error\"\n\nRevert submission 3495771-upgrade-mockito\n\nReason for revert: DroidMonitor: Potential culprit for http://b/397508359 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\nReverted changes: /q/submissionid:3495771-upgrade-mockito\n\nChange-Id: I63b051558c6a5c296723050acecb4f0d946fedab\n" }, { "commit": "e1b5d3fa262eb3997f77847c31312ac1caa33552", "tree": "9c5fc98a9e8d671ff34d3b1baed368f093bc8e85", "parents": [ "1c9304abba8f0c526f125bc94cb4aae866160739", "9c8cc4d25424d49135596041970b9f0c9163ee8f" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Feb 18 13:32:38 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 18 13:32:38 2025 -0800" }, "message": "Merge changes from topic \"upgrade-mockito\" into main am: 9c8cc4d254\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3495771\n\nChange-Id: I49929a3a274c0662f51a277430373b71146b8748\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c8cc4d25424d49135596041970b9f0c9163ee8f", "tree": "9c5fc98a9e8d671ff34d3b1baed368f093bc8e85", "parents": [ "90d02799b2b854c7d6755c649d5cc065f344eeed", "31b873ade51e54413c46d1dd7dbc7cb46dbc9589" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Feb 18 12:57:01 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 18 12:57:01 2025 -0800" }, "message": "Merge changes from topic \"upgrade-mockito\" into main\n\n* changes:\n Mockito: Suppress errorprone error\n mockito: Add back removed FieldSetter\n mockito: remove opentest4j dependency\n Upgrade mockito to v3.12.4\n" }, { "commit": "31b873ade51e54413c46d1dd7dbc7cb46dbc9589", "tree": "9c5fc98a9e8d671ff34d3b1baed368f093bc8e85", "parents": [ "8957d3aab05d1c0fc697f5e240858121ffba911d" ], "author": { "name": "dependabot[bot]", "email": "49699333+dependabot[bot]@users.noreply.github.com", "time": "Fri Nov 05 18:36:07 2021 +0000" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Feb 18 12:43:03 2025 -0800" }, "message": "Mockito: Suppress errorprone error\n\nFix is in upstream at https://github.com/mockito/mockito/commit/584504e8c8ec027d41865eb593be915cb376fb72\n\nChange-Id: If102e7c51891150caf119254d06aa9ff0f6b7757\n" }, { "commit": "8957d3aab05d1c0fc697f5e240858121ffba911d", "tree": "a060fc75066a1cc1ddf8675a057ef8a1e7dd4628", "parents": [ "db527f6c47bf23211738935bafa4626f7acf730c" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 17 12:56:14 2025 +0100" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 17 15:24:20 2025 +0100" }, "message": "mockito: Add back removed FieldSetter\n\nAdds back a removed internal class that is being used\nby a lot of Android tests; to be removed after last usage\nis gone.\n\nChange-Id: I3c7d7e3e9b6ef561c504cb85cd96f8eb25b85d4c\n" }, { "commit": "db527f6c47bf23211738935bafa4626f7acf730c", "tree": "ba22e083349e1bf7a8b9e2b423814369fb95ef7a", "parents": [ "887cae9554a8e187529f8f5d1653a2d94d9141e5" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Fri Feb 14 14:25:39 2025 +0100" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 17 15:24:20 2025 +0100" }, "message": "mockito: remove opentest4j dependency\n\nChange-Id: I9fbf7a5bcec8c9ed26e43b659e1db116ffc80098\n" }, { "commit": "887cae9554a8e187529f8f5d1653a2d94d9141e5", "tree": "38bd5c951f3fd2d96e3901419d63593c4355a27d", "parents": [ "90d02799b2b854c7d6755c649d5cc065f344eeed" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Feb 13 15:23:46 2025 +0100" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Feb 17 15:24:20 2025 +0100" }, "message": "Upgrade mockito to v3.12.4\n\nThis project was upgraded with external_updater.\nUsage: tools/external_updater/updater.sh update external/mockito\nFor more info, check https://cs.android.com/android/platform/superproject/main/+/main:tools/external_updater/README.md\n\nTest: TreeHugger\nChange-Id: I3e6a32a8272b6f9ae133af357cc265e8867d125e\n" }, { "commit": "1c9304abba8f0c526f125bc94cb4aae866160739", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "ceffa222020788e9b81e120db61d5f29c922f983", "90d02799b2b854c7d6755c649d5cc065f344eeed" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 18 13:03:33 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 18 13:03:33 2024 -0800" }, "message": "Merge \"Add janitors to the OWNERS file\" into main am: 90d02799b2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3423788\n\nChange-Id: Ib5f0870058b8f4e32a6c40f1fe4c609cb908d616\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "90d02799b2b854c7d6755c649d5cc065f344eeed", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "ceffa222020788e9b81e120db61d5f29c922f983", "2441c76e558cd9c6ce20bb7a9b1b14b6d68f8bb8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 18 12:31:41 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 18 12:31:41 2024 -0800" }, "message": "Merge \"Add janitors to the OWNERS file\" into main" }, { "commit": "2441c76e558cd9c6ce20bb7a9b1b14b6d68f8bb8", "tree": "edfddfb09e488ae5cc912425dfc381478031ba4c", "parents": [ "ceffa222020788e9b81e120db61d5f29c922f983" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:28:20 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:28:20 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: I59a6a40c9511a8f7fe13fbe9038015bd1c548306\n" }, { "commit": "ceffa222020788e9b81e120db61d5f29c922f983", "tree": "bd97c9e068bf7b7e9e5b3854de9226b69d100149", "parents": [ "7eff173851189379d71fcea40f15bf2658910d6c", "80be804a9460221a8c664a9a0bf58237c5ccbdc5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jul 18 13:13:33 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 18 13:13:33 2024 +0000" }, "message": "Merge \"Use common byte-buddy prebuilts\" into main am: bb175da0af am: 80be804a94\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3180640\n\nChange-Id: I8930a1bfae9f87428eb1eeac7b0f0e7cfbda5ebb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "80be804a9460221a8c664a9a0bf58237c5ccbdc5", "tree": "bd97c9e068bf7b7e9e5b3854de9226b69d100149", "parents": [ "7eff173851189379d71fcea40f15bf2658910d6c", "bb175da0afb48e10e841ef342be773268191483f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jul 18 12:58:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 18 12:58:25 2024 +0000" }, "message": "Merge \"Use common byte-buddy prebuilts\" into main am: bb175da0af\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3180640\n\nChange-Id: Ia7a7a3647c26216f01f1437a8b5e7680e536b924\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb175da0afb48e10e841ef342be773268191483f", "tree": "bd97c9e068bf7b7e9e5b3854de9226b69d100149", "parents": [ "7469ffab1eebe39d70d7bc068e674d15ef8fcecd", "96518a1ca42e53a1c80b03ad745132a728419e12" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jul 18 12:35:08 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 18 12:35:08 2024 +0000" }, "message": "Merge \"Use common byte-buddy prebuilts\" into main" }, { "commit": "96518a1ca42e53a1c80b03ad745132a728419e12", "tree": "bd97c9e068bf7b7e9e5b3854de9226b69d100149", "parents": [ "7469ffab1eebe39d70d7bc068e674d15ef8fcecd" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Thu Jul 18 10:27:15 2024 +0100" }, "committer": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Thu Jul 18 10:27:15 2024 +0100" }, "message": "Use common byte-buddy prebuilts\n\nBug: 353809628\nBug: 340486785\nTest: mmm external/mockito\nChange-Id: Ib8cbbb3997b8467617ce974f61acf0c2d5c35964\n" }, { "commit": "7eff173851189379d71fcea40f15bf2658910d6c", "tree": "787b954a31dc7882ce69eb6824e294edc8aedd49", "parents": [ "8e7b26802621b0e877d690007838cd054d2b8004", "7469ffab1eebe39d70d7bc068e674d15ef8fcecd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 22:35:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 22:35:21 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 7469ffab1e -s ours\n\nam skip reason: Merged-In I14ed7c032a974c3a65caaf091d36d9667ea331b6 with SHA-1 50381c5a8b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/27144224\n\nChange-Id: Ib5e2411e18e31d8de86eb626989e2c60371a9e52\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7469ffab1eebe39d70d7bc068e674d15ef8fcecd", "tree": "787b954a31dc7882ce69eb6824e294edc8aedd49", "parents": [ "f45b40cb0810a9ae44d706a445fefd84983b0a7a", "cebb4662dd8dbdbb524764e8dbc6a3f2e25a7d91" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:50:14 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:50:14 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I14ed7c032a974c3a65caaf091d36d9667ea331b6\nChange-Id: Id3754c8209a53f5730fbfdf9e3c509e7e4eda655\n" }, { "commit": "8e7b26802621b0e877d690007838cd054d2b8004", "tree": "787b954a31dc7882ce69eb6824e294edc8aedd49", "parents": [ "cebb4662dd8dbdbb524764e8dbc6a3f2e25a7d91", "f45b40cb0810a9ae44d706a445fefd84983b0a7a" ], "author": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Thu Apr 04 23:18:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 04 23:18:47 2024 +0000" }, "message": "Merge changes from topic \"mockito-upgrade-2-23-0\" into main am: d0c9098e3c am: f45b40cb08\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3025126\n\nChange-Id: I3492f0bc8c35ebd997c9d384a8313688dea67a87\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f45b40cb0810a9ae44d706a445fefd84983b0a7a", "tree": "787b954a31dc7882ce69eb6824e294edc8aedd49", "parents": [ "e1e7a35af3cd7d530343c0a2c0bc1ce40edd6508", "d0c9098e3cda5fd6755e5ac089077bfc55b03fa6" ], "author": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Thu Apr 04 23:06:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 04 23:06:15 2024 +0000" }, "message": "Merge changes from topic \"mockito-upgrade-2-23-0\" into main am: d0c9098e3c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/3025126\n\nChange-Id: I33ef8422fb638a77c774e3667ed8fc401dd8c426\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d0c9098e3cda5fd6755e5ac089077bfc55b03fa6", "tree": "787b954a31dc7882ce69eb6824e294edc8aedd49", "parents": [ "e1e7a35af3cd7d530343c0a2c0bc1ce40edd6508", "db4edcf60c7b9b2961681d8f44a248ff9117c218" ], "author": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Thu Apr 04 22:48:01 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 04 22:48:01 2024 +0000" }, "message": "Merge changes from topic \"mockito-upgrade-2-23-0\" into main\n\n* changes:\n Reapply \"Fixed DefaultMockitoSession constructor\"\n Reapply \"New API to clean up all inline mocks after test\"\n Upgrade mockito to version 2.23.0\n" }, { "commit": "db4edcf60c7b9b2961681d8f44a248ff9117c218", "tree": "787b954a31dc7882ce69eb6824e294edc8aedd49", "parents": [ "e4a0cddc68a5f1eda817b8d9e0ebacb73449d7f1" ], "author": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Wed Apr 03 16:04:11 2024 -0400" }, "committer": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Wed Apr 03 16:04:11 2024 -0400" }, "message": "Reapply \"Fixed DefaultMockitoSession constructor\"\n\nIt was not removing the UniversalTestListener when initmocks()\nfailed, which would cause subsequent tests to fail because they could\nnot start a new session.\n\nTo test it, run the following command in a pristine device running\nAndroid TM (without an updated adservices apk) - a lot of tests will\nfail due to missing classes and methods.\n\n$ atest AdServicesServiceCoreUnitTests 2\u003e\u00261 | tee ~/tmp/log.txt \u0026\u0026 grep \"Unfinished mocking session\" ~/tmp/log.txt | wc\n\nWithout this patch, it would return non zero occurrences; with it, it\u0027s 0.\n\nTest: manual verification (see above)\nBug: 140773999\nChange-Id: I98389077c09af406ac46514d49d4b546b9d5690d\n" }, { "commit": "e4a0cddc68a5f1eda817b8d9e0ebacb73449d7f1", "tree": "70b137038f76d4d358d052fef43a76d67b7e471a", "parents": [ "70d9b29729996aebf6de5b3d536e379d38e4209c" ], "author": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Wed Apr 03 16:00:09 2024 -0400" }, "committer": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Wed Apr 03 16:00:09 2024 -0400" }, "message": "Reapply \"New API to clean up all inline mocks after test\"\n\nBug: 140773999\nTest: Presubmit\nChange-Id: Ia4ed03c211369b086d05134669f8e75287307f15\n" }, { "commit": "70d9b29729996aebf6de5b3d536e379d38e4209c", "tree": "9a2c6708b6e6412596dfa9e3a18bcc492bc41116", "parents": [ "e1e7a35af3cd7d530343c0a2c0bc1ce40edd6508" ], "author": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Wed Apr 03 15:41:23 2024 -0400" }, "committer": { "name": "Liran Binyamin", "email": "liranb@google.com", "time": "Wed Apr 03 15:42:50 2024 -0400" }, "message": "Upgrade mockito to version 2.23.0\n\nThis is a clean version of mockito v2.23.0 without any local patches applied.\n\nBug: 140773999\nTest: presubmit\nChange-Id: I9c9fb77395921c72f3a402672303b34e7c32dab9\n" }, { "commit": "cebb4662dd8dbdbb524764e8dbc6a3f2e25a7d91", "tree": "7e9f5ae3e621bf35333c6a2870f04cc453bf107f", "parents": [ "c56c30196fe50fb3dc1d128e3723155f478c07b2", "50381c5a8bcdc5ba02d5b57e1e5a79fccdd87669" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Wed Jan 31 18:10:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 18:10:46 2024 +0000" }, "message": "[automerger skipped] Fixed DefaultMockitoSession constructor. am: 50381c5a8b -s ours\n\nam skip reason: Merged-In I14ed7c032a974c3a65caaf091d36d9667ea331b6 with SHA-1 2982d1e495 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/26030020\n\nChange-Id: Ib228511bbda471487b55e7722453c988521bead9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50381c5a8bcdc5ba02d5b57e1e5a79fccdd87669", "tree": "7e9f5ae3e621bf35333c6a2870f04cc453bf107f", "parents": [ "fb1f9e9ccd2c2ae32326c74346cb33d7f925190a" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Fri Jan 26 14:21:18 2024 -0800" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Tue Jan 30 07:38:45 2024 -0800" }, "message": "Fixed DefaultMockitoSession constructor.\n\nIt was not removing the UniversalTestListener when initmocks()\nfailed, which would cause subsequent tests to fail because they could\nnot start a new session.\n\nTo test it, run the following command in a pristine device running\nAndroid TM (without an updated adservices apk) - a lot of tests will\nfail due to missing classes and methods.\n\n$ atest AdServicesServiceCoreUnitTests 2\u003e\u00261 | tee ~/tmp/log.txt \u0026\u0026 grep \"Unfinished mocking session\" ~/tmp/log.txt | wc\n\nWithout this patch, it would return ~216 occurrences; with it, it\u0027s 0.\n\nTest: manual verification (see above)\nBug: 322415729\n\nChange-Id: I14ed7c032a974c3a65caaf091d36d9667ea331b6\nMerged-In: I14ed7c032a974c3a65caaf091d36d9667ea331b6\n(cherry picked from commit 2982d1e4951883dea75847910feedbb852a4a2b1 - AOSP/main)\n" }, { "commit": "c56c30196fe50fb3dc1d128e3723155f478c07b2", "tree": "7e9f5ae3e621bf35333c6a2870f04cc453bf107f", "parents": [ "fb1f9e9ccd2c2ae32326c74346cb33d7f925190a", "e1e7a35af3cd7d530343c0a2c0bc1ce40edd6508" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 29 20:48:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 29 20:48:41 2024 +0000" }, "message": "Merge \"Fixed DefaultMockitoSession constructor.\" into main am: ece464fd0a am: e1e7a35af3\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2929425\n\nChange-Id: I55690b6a3e06588463677cb26c205a7e649124e1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e1e7a35af3cd7d530343c0a2c0bc1ce40edd6508", "tree": "7e9f5ae3e621bf35333c6a2870f04cc453bf107f", "parents": [ "fb1f9e9ccd2c2ae32326c74346cb33d7f925190a", "ece464fd0a2f69b4dfe7e57ff9d2e1c04f2172ae" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 29 20:05:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 29 20:05:18 2024 +0000" }, "message": "Merge \"Fixed DefaultMockitoSession constructor.\" into main am: ece464fd0a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2929425\n\nChange-Id: Icf68eab9be471270f1f0cd7a74d19089b103b345\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ece464fd0a2f69b4dfe7e57ff9d2e1c04f2172ae", "tree": "7e9f5ae3e621bf35333c6a2870f04cc453bf107f", "parents": [ "fb1f9e9ccd2c2ae32326c74346cb33d7f925190a", "2982d1e4951883dea75847910feedbb852a4a2b1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 29 19:38:59 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 29 19:38:59 2024 +0000" }, "message": "Merge \"Fixed DefaultMockitoSession constructor.\" into main" }, { "commit": "2982d1e4951883dea75847910feedbb852a4a2b1", "tree": "7e9f5ae3e621bf35333c6a2870f04cc453bf107f", "parents": [ "fb1f9e9ccd2c2ae32326c74346cb33d7f925190a" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Fri Jan 26 14:21:18 2024 -0800" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Jan 29 18:33:15 2024 +0000" }, "message": "Fixed DefaultMockitoSession constructor.\n\nIt was not removing the UniversalTestListener when initmocks()\nfailed, which would cause subsequent tests to fail because they could\nnot start a new session.\n\nTo test it, run the following command in a pristine device running\nAndroid TM (without an updated adservices apk) - a lot of tests will\nfail due to missing classes and methods.\n\n$ atest AdServicesServiceCoreUnitTests 2\u003e\u00261 | tee ~/tmp/log.txt \u0026\u0026 grep \"Unfinished mocking session\" ~/tmp/log.txt | wc\n\nWithout this patch, it would return ~216 occurrences; with it, it\u0027s 0.\n\nTest: manual verification (see above)\nBug: 322415729\n\nChange-Id: I14ed7c032a974c3a65caaf091d36d9667ea331b6\n" }, { "commit": "fb1f9e9ccd2c2ae32326c74346cb33d7f925190a", "tree": "153bddd4263a4a0bea42da7a7749157227a96357", "parents": [ "ced9e99d365fe5d571458adf40af041683dc4f4f", "d033d9ff9eb8af5e195ae0f616383ad36dcacb67" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jan 18 21:20:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 18 21:20:42 2023 +0000" }, "message": "Merge \"Add alias for mockito-core naming scheme\" am: 9241a45d30 am: 33de180a1a am: d033d9ff9e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2393172\n\nChange-Id: I6c290b77dfc3bfacd8f2aa32c0def257bef8c729\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d033d9ff9eb8af5e195ae0f616383ad36dcacb67", "tree": "153bddd4263a4a0bea42da7a7749157227a96357", "parents": [ "078a2a13d406172bbd83f2319fe73dbc7fcbc743", "33de180a1a900d62d3db6a0995738a274c51d3a3" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jan 18 20:44:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 18 20:44:16 2023 +0000" }, "message": "Merge \"Add alias for mockito-core naming scheme\" am: 9241a45d30 am: 33de180a1a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2393172\n\nChange-Id: I32da1516857d31b78cffef61bd3c793e2b5e96d6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "33de180a1a900d62d3db6a0995738a274c51d3a3", "tree": "153bddd4263a4a0bea42da7a7749157227a96357", "parents": [ "078a2a13d406172bbd83f2319fe73dbc7fcbc743", "9241a45d30e6e65a7ed58dc105c19ff92dc0e19d" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jan 18 20:05:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 18 20:05:36 2023 +0000" }, "message": "Merge \"Add alias for mockito-core naming scheme\" am: 9241a45d30\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2393172\n\nChange-Id: Iddcb7a5d9626bbfff2d8df73a9e0b4a6d7d132bc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9241a45d30e6e65a7ed58dc105c19ff92dc0e19d", "tree": "153bddd4263a4a0bea42da7a7749157227a96357", "parents": [ "8455c9ae1691de2eb8ecae4eaf46a056d19a77d6", "3e89f4930a3b1575b896e0914321f892e3c3c535" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jan 18 19:14:03 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 18 19:14:03 2023 +0000" }, "message": "Merge \"Add alias for mockito-core naming scheme\"" }, { "commit": "3e89f4930a3b1575b896e0914321f892e3c3c535", "tree": "153bddd4263a4a0bea42da7a7749157227a96357", "parents": [ "8455c9ae1691de2eb8ecae4eaf46a056d19a77d6" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jan 18 15:04:00 2023 +0000" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Jan 18 10:07:08 2023 -0500" }, "message": "Add alias for mockito-core naming scheme\n\nBug: 265820493\nChange-Id: Iec7178482f7101e0a933b349b6d73dcc3e53d082\nTest: it builds\n" }, { "commit": "ced9e99d365fe5d571458adf40af041683dc4f4f", "tree": "fbe29d8cad9bc0050b6eb8eeb8a9b1551e7b8780", "parents": [ "c978470e72bceeb947b9ab201554f48b31200675", "078a2a13d406172bbd83f2319fe73dbc7fcbc743" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 26 19:52:19 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 19:52:19 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\" am: e4cddf0555 am: 8455c9ae16 am: 078a2a13d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2255051\n\nChange-Id: Ice77912be84219c4742e97afda865eeb723ce924\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "078a2a13d406172bbd83f2319fe73dbc7fcbc743", "tree": "fbe29d8cad9bc0050b6eb8eeb8a9b1551e7b8780", "parents": [ "c978470e72bceeb947b9ab201554f48b31200675", "8455c9ae1691de2eb8ecae4eaf46a056d19a77d6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 26 19:10:23 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 19:10:23 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\" am: e4cddf0555 am: 8455c9ae16\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2255051\n\nChange-Id: I0ebe90430063c5af9f222b7e6fdce7f4d411d1e5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8455c9ae1691de2eb8ecae4eaf46a056d19a77d6", "tree": "fbe29d8cad9bc0050b6eb8eeb8a9b1551e7b8780", "parents": [ "c978470e72bceeb947b9ab201554f48b31200675", "e4cddf0555bf300dcc9adf9d615c3a72b5ec7b22" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 26 18:36:50 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 18:36:50 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\" am: e4cddf0555\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/2255051\n\nChange-Id: Ibaab3aa4c76347dde638d57dc3b90393fc525505\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e4cddf0555bf300dcc9adf9d615c3a72b5ec7b22", "tree": "fbe29d8cad9bc0050b6eb8eeb8a9b1551e7b8780", "parents": [ "c978470e72bceeb947b9ab201554f48b31200675", "c29e69b8e363cf86dc7a44f766cc4e2fec2b314c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 26 17:59:21 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 26 17:59:21 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\"" }, { "commit": "c29e69b8e363cf86dc7a44f766cc4e2fec2b314c", "tree": "fbe29d8cad9bc0050b6eb8eeb8a9b1551e7b8780", "parents": [ "c978470e72bceeb947b9ab201554f48b31200675" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Oct 15 21:33:33 2022 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Oct 15 21:33:33 2022 -0700" }, "message": "Fix errorprone warnings that should be errors\n\nThis commit is part of a large scale change to fix errorprone\nerrors that have been downgraded to warnings in the android\nsource tree, so that they can be promoted to errors again.\nThe full list of changes include the following, but not all\nwill be present in any one individual commit:\n\nBadAnnotationImplementation\nBadShiftAmount\nBanJNDI\nBoxedPrimitiveEquality\nComparableType\nComplexBooleanConstant\nCollectionToArraySafeParameter\nConditionalExpressionNumericPromotion\nDangerousLiteralNull\nDoubleBraceInitialization\nDurationFrom\nDurationTemporalUnit\nEmptyTopLevelDeclaration\nEqualsNull\nEqualsReference\nFormatString\nFromTemporalAccessor\nGetClassOnAnnotation\nGetClassOnClass\nHashtableContains\nIdentityBinaryExpression\nIdentityHashMapBoxing\nInstantTemporalUnit\nInvalidTimeZoneID\nInvalidZoneId\nIsInstanceIncompatibleType\nJUnitParameterMethodNotFound\nLockOnBoxedPrimitive\nMathRoundIntLong\nMislabeledAndroidString\nMisusedDayOfYear\nMissingSuperCall\nMisusedWeekYear\nModifyingCollectionWithItself\nNoCanIgnoreReturnValueOnClasses\nNonRuntimeAnnotation\nNullableOnContainingClass\nNullTernary\nOverridesJavaxInjectableMethod\nParcelableCreator\nPeriodFrom\nPreconditionsInvalidPlaceholder\nProtoBuilderReturnValueIgnored\nProtoFieldNullComparison\nRandomModInteger\nRectIntersectReturnValueIgnored\nReturnValueIgnored\nSelfAssignment\nSelfComparison\nSelfEquals\nSizeGreaterThanOrEqualsZero\nStringBuilderInitWithChar\nTreeToString\nTryFailThrowable\nUnnecessaryCheckNotNull\nUnusedCollectionModifiedInPlace\nXorPower\n\nSee https://errorprone.info/bugpatterns for more\ninformation on the checks.\n\nBug: 253827323\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nChange-Id: I907959a17cd5fdf6504a654a08b4be93ef400d88\n" }, { "commit": "c978470e72bceeb947b9ab201554f48b31200675", "tree": "8a9198e8cae4489eb68fbba2690eb860a239b0ec", "parents": [ "2282b889503e0607afe782fe80d209ab96ffd92b", "60a5acae7699a6b45c67354a0a0070e89bcb61f8" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Jan 14 20:37:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 20:37:37 2022 +0000" }, "message": "Merge \"Updating byte-buddy from 1.8.15 to 1.9.3\" am: f18976c094 am: f0ec16c204 am: 1082433307 am: 60a5acae76\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576\n\nChange-Id: I266cff9f1ea733be2405e02d9ee0f0d12c5b607a\n" }, { "commit": "60a5acae7699a6b45c67354a0a0070e89bcb61f8", "tree": "8a9198e8cae4489eb68fbba2690eb860a239b0ec", "parents": [ "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d", "10824333072967fe9a03419216bd6b85dd766aed" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Jan 14 20:24:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 20:24:42 2022 +0000" }, "message": "Merge \"Updating byte-buddy from 1.8.15 to 1.9.3\" am: f18976c094 am: f0ec16c204 am: 1082433307\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576\n\nChange-Id: I16a92dd12a25fce507effb13aa7516d27d99d00e\n" }, { "commit": "10824333072967fe9a03419216bd6b85dd766aed", "tree": "8a9198e8cae4489eb68fbba2690eb860a239b0ec", "parents": [ "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d", "f0ec16c204a1809ca8cef080a7019a185f52e197" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Jan 14 20:08:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 20:08:16 2022 +0000" }, "message": "Merge \"Updating byte-buddy from 1.8.15 to 1.9.3\" am: f18976c094 am: f0ec16c204\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576\n\nChange-Id: I9ec753a05263de4494a6383f72bcc68a43987cb2\n" }, { "commit": "f0ec16c204a1809ca8cef080a7019a185f52e197", "tree": "8a9198e8cae4489eb68fbba2690eb860a239b0ec", "parents": [ "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d", "f18976c094ee36be77f15e0be5b89847fc777b42" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Jan 14 19:50:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 19:50:00 2022 +0000" }, "message": "Merge \"Updating byte-buddy from 1.8.15 to 1.9.3\" am: f18976c094\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576\n\nChange-Id: If941abcad58a95716618c3798d3bd70f607d99ed\n" }, { "commit": "f18976c094ee36be77f15e0be5b89847fc777b42", "tree": "8a9198e8cae4489eb68fbba2690eb860a239b0ec", "parents": [ "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d", "2365a123d0b8cffc3717f4583e515c99f88dac41" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Jan 14 19:37:30 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 14 19:37:30 2022 +0000" }, "message": "Merge \"Updating byte-buddy from 1.8.15 to 1.9.3\"" }, { "commit": "2365a123d0b8cffc3717f4583e515c99f88dac41", "tree": "8a9198e8cae4489eb68fbba2690eb860a239b0ec", "parents": [ "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Thu Jan 13 13:11:19 2022 +0000" }, "committer": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Thu Jan 13 13:11:19 2022 +0000" }, "message": "Updating byte-buddy from 1.8.15 to 1.9.3\n\nBug: 135459087\nTest: Presubmit\nChange-Id: I5c3124028258e95ee2b0504d1efe6e8da8ad9460\n" }, { "commit": "2282b889503e0607afe782fe80d209ab96ffd92b", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "93ee24c1be7f92896f13120bf2e84881af2d127a", "e548fb759f3e61a9b6326babdb23dfae05335ac2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:50:11 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:50:11 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: I54b2d22fc3cb6f4b537cd5a3c79390ea2a760244\n" }, { "commit": "93ee24c1be7f92896f13120bf2e84881af2d127a", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "ffdb4f1c23671ff00639fc842afbb591567ef478", "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 12:18:44 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 12:18:44 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s ours am: fb01a48139 -s ours am: a3e8cbbf8d -s ours\n\nam skip reason: Change-Id Ia1f0066b013154d43e3a1a645e4552790814ee46 with SHA-1 449a269475 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I3ef8eb3f29e2d64824a15b3106eeedab43ecd6d8\n" }, { "commit": "e548fb759f3e61a9b6326babdb23dfae05335ac2", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "5f0e35facf4850fc7f0af03cef29949a4c63168f", "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 12:17:05 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 12:17:05 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s ours am: fb01a48139 -s ours am: a3e8cbbf8d -s ours\n\nam skip reason: Change-Id Ia1f0066b013154d43e3a1a645e4552790814ee46 with SHA-1 449a269475 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I14d0037bc110d626d4f9a80a08cebac0ac7b52ad\n" }, { "commit": "a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "3fd39658c647b18f397941bc6ae95d93b2ec21cc", "fb01a48139a7fd86de2e6a50b82f23cece233fee" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 11:46:40 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 11:46:40 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s ours am: fb01a48139 -s ours\n\nam skip reason: Change-Id Ia1f0066b013154d43e3a1a645e4552790814ee46 with SHA-1 449a269475 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ic0cec7e89a131dfe5345a2cd540013480cbdb0ee\n" }, { "commit": "fb01a48139a7fd86de2e6a50b82f23cece233fee", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "b648206c8e3bbdf766aa0bc1750c24ef8d7f37d5", "485127ff5025c00db5ff1bfa75ac230b0987879c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 10:10:21 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 10:10:21 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s ours\n\nam skip reason: Change-Id Ia1f0066b013154d43e3a1a645e4552790814ee46 with SHA-1 449a269475 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I41686dd004e44660627116bfbc619cb4253202d5\n" }, { "commit": "485127ff5025c00db5ff1bfa75ac230b0987879c", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "6706f18ce26fcc6b6fe00c9667fad59e59744906", "449a269475aaf4d50f7f76d223a47daac738eadd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:14 2021 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:14 2021 -0800" }, "message": "Mark ab/7061308 as merged in stage.\n\nBug: 180401296\nMerged-In: Ia1f0066b013154d43e3a1a645e4552790814ee46\nChange-Id: Ic046e9f0828241228935b4e2f389c67a91fb9c90\n" }, { "commit": "5f0e35facf4850fc7f0af03cef29949a4c63168f", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "2bf68d92e4b3398a7d8875a27fac9cf01a66654d", "3fd39658c647b18f397941bc6ae95d93b2ec21cc" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:17:51 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:17:51 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/mockito\" am: 2d7cca944c am: 6706f18ce2 am: b648206c8e am: 3fd39658c6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I62e558cae43d50dbbbcc510a5d705c161bb1b14a\n" }, { "commit": "ffdb4f1c23671ff00639fc842afbb591567ef478", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "3f3dd86486949b862202fc1cb03bb9bb72e06ff9", "3fd39658c647b18f397941bc6ae95d93b2ec21cc" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:17:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:17:22 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/mockito\" am: 2d7cca944c am: 6706f18ce2 am: b648206c8e am: 3fd39658c6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ia8653092022481adad174a6ea69c8ff73acf65e5\n" }, { "commit": "3fd39658c647b18f397941bc6ae95d93b2ec21cc", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "823fafe16699c6b1e4e2d0833d18b7f3073a30ac", "b648206c8e3bbdf766aa0bc1750c24ef8d7f37d5" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:02:17 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:02:17 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/mockito\" am: 2d7cca944c am: 6706f18ce2 am: b648206c8e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I00a8ae06986b512e3a9b7e15c50936fe6b6f9d90\n" }, { "commit": "b648206c8e3bbdf766aa0bc1750c24ef8d7f37d5", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "ac46fec39926db9ec4750fad6e6b87c6dcae8606", "6706f18ce26fcc6b6fe00c9667fad59e59744906" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 22:23:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 22:23:20 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/mockito\" am: 2d7cca944c am: 6706f18ce2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ie329bd69603b00ab17ef0496a1a36abfbde34c9f\n" }, { "commit": "6706f18ce26fcc6b6fe00c9667fad59e59744906", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "9ecc6830dd71ee702ad8ceda41035b439277e7d1", "2d7cca944ceb77906457ece726545a9e0ed562aa" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 21:45:46 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 21:45:46 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/mockito\" am: 2d7cca944c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ib99e39c501d34456d029192ef2cdd6549b711992\n" }, { "commit": "2d7cca944ceb77906457ece726545a9e0ed562aa", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "1569d6a6628ae5de313d772f3cb6cadffc193469", "c9ec311955fc89f3acb5885da92050a26ddcf6da" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 21:13:05 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 16 21:13:05 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/mockito\"" }, { "commit": "c9ec311955fc89f3acb5885da92050a26ddcf6da", "tree": "282ecb140139a5cff47b139b1d2b936c92fefd72", "parents": [ "1569d6a6628ae5de313d772f3cb6cadffc193469" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 21:28:53 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 21:28:53 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT to:\n Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: Id5ddf2261ef4ffd8f238a28fa96a81e49369e58b\n" }, { "commit": "3f3dd86486949b862202fc1cb03bb9bb72e06ff9", "tree": "931d2b6c5c73e0880a70b886511dc8872bedcaf5", "parents": [ "029cf255acb165ecc9fe2eb916eb07575fb1069d", "823fafe16699c6b1e4e2d0833d18b7f3073a30ac" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Feb 04 03:03:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 04 03:03:30 2021 +0000" }, "message": "Merge \"Remove me from OWNERS file\" am: 1569d6a662 am: 9ecc6830dd am: ac46fec399 am: 823fafe166\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I932503537e361f4853c62f1c103e6f66c71f10d0\n" }, { "commit": "2bf68d92e4b3398a7d8875a27fac9cf01a66654d", "tree": "931d2b6c5c73e0880a70b886511dc8872bedcaf5", "parents": [ "029cf255acb165ecc9fe2eb916eb07575fb1069d", "823fafe16699c6b1e4e2d0833d18b7f3073a30ac" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Feb 04 03:03:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 04 03:03:13 2021 +0000" }, "message": "Merge \"Remove me from OWNERS file\" am: 1569d6a662 am: 9ecc6830dd am: ac46fec399 am: 823fafe166\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I4be2015d29033759ba7c52276d19a20cb8b1dade\n" }, { "commit": "823fafe16699c6b1e4e2d0833d18b7f3073a30ac", "tree": "931d2b6c5c73e0880a70b886511dc8872bedcaf5", "parents": [ "029cf255acb165ecc9fe2eb916eb07575fb1069d", "ac46fec39926db9ec4750fad6e6b87c6dcae8606" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Feb 04 02:22:56 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 04 02:22:56 2021 +0000" }, "message": "Merge \"Remove me from OWNERS file\" am: 1569d6a662 am: 9ecc6830dd am: ac46fec399\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Icf1f3beeac92b2ab07a56a4d93d992dd636f2e4f\n" }, { "commit": "ac46fec39926db9ec4750fad6e6b87c6dcae8606", "tree": "931d2b6c5c73e0880a70b886511dc8872bedcaf5", "parents": [ "449a269475aaf4d50f7f76d223a47daac738eadd", "9ecc6830dd71ee702ad8ceda41035b439277e7d1" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Feb 04 02:00:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 04 02:00:13 2021 +0000" }, "message": "Merge \"Remove me from OWNERS file\" am: 1569d6a662 am: 9ecc6830dd\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: If574b87fbe4ec9e9ce0a3005fcd5c72e72cd7972\n" }, { "commit": "9ecc6830dd71ee702ad8ceda41035b439277e7d1", "tree": "931d2b6c5c73e0880a70b886511dc8872bedcaf5", "parents": [ "6e416902e51728849c4cc8bcafc1c0548781e46b", "1569d6a6628ae5de313d772f3cb6cadffc193469" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Feb 04 01:01:23 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 04 01:01:23 2021 +0000" }, "message": "Merge \"Remove me from OWNERS file\" am: 1569d6a662\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Idb5f6d148e5cbe1c2c921612ecef9c7fdb57b6c0\n" }, { "commit": "1569d6a6628ae5de313d772f3cb6cadffc193469", "tree": "931d2b6c5c73e0880a70b886511dc8872bedcaf5", "parents": [ "6e416902e51728849c4cc8bcafc1c0548781e46b", "a71eadcd5105fed51164243a1da22c5d5daf1d23" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 03 23:16:57 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 03 23:16:57 2021 +0000" }, "message": "Merge \"Remove me from OWNERS file\"" }, { "commit": "a71eadcd5105fed51164243a1da22c5d5daf1d23", "tree": "931d2b6c5c73e0880a70b886511dc8872bedcaf5", "parents": [ "6e416902e51728849c4cc8bcafc1c0548781e46b" ], "author": { "name": "Philip P. Moltmann", "email": "moltmann@google.com", "time": "Wed Feb 03 12:16:12 2021 -0800" }, "committer": { "name": "Philip P. Moltmann", "email": "moltmann@google.com", "time": "Wed Feb 03 13:45:06 2021 -0800" }, "message": "Remove me from OWNERS file\n\n(also removed invalid entry for jmonk@)\n\nTest: n/a\nChange-Id: If1994e47f937b8bfa6bfb47f9e825c971aac6161\n" }, { "commit": "029cf255acb165ecc9fe2eb916eb07575fb1069d", "tree": "461addbed55d7c08f13857fc628599b4e0dea404", "parents": [ "d68e156658fa30de636c936248eba3e53a629445", "449a269475aaf4d50f7f76d223a47daac738eadd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 24 00:39:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 24 00:39:17 2020 +0000" }, "message": "Mark ab/6881855 as merged am: 6e416902e5 am: 449a269475\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/13112857\n\nChange-Id: Ic1f319d21a5f7d968ff5c15f9c51e7799b0899fc\n" }, { "commit": "449a269475aaf4d50f7f76d223a47daac738eadd", "tree": "461addbed55d7c08f13857fc628599b4e0dea404", "parents": [ "1fdf972de4b71a0d8ea3bda3f197991b2ddab599", "6e416902e51728849c4cc8bcafc1c0548781e46b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 24 00:14:00 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 24 00:14:00 2020 +0000" }, "message": "Mark ab/6881855 as merged am: 6e416902e5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/13112857\n\nChange-Id: Ia1f0066b013154d43e3a1a645e4552790814ee46\n" }, { "commit": "6e416902e51728849c4cc8bcafc1c0548781e46b", "tree": "461addbed55d7c08f13857fc628599b4e0dea404", "parents": [ "f823643d8322ff182771185128acf6a1831b5171", "cc3575d2af08b440bc340913c33e89a74e79d9c9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 23 11:30:22 2020 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 23 11:30:22 2020 -0800" }, "message": "Mark ab/6881855 as merged\n\nBug: 172690556\nChange-Id: Ie4b6bbd9eaa7268839c04158681beb90754e3d08\n" }, { "commit": "d68e156658fa30de636c936248eba3e53a629445", "tree": "461addbed55d7c08f13857fc628599b4e0dea404", "parents": [ "14cab6e912dcaaf6ae90585aa1e73b268d75d8a7", "1fdf972de4b71a0d8ea3bda3f197991b2ddab599" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 03:25:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 03:25:16 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s ours am: 6da1fecdac -s ours am: 1fdf972de4 -s ours\n\nam skip reason: Change-Id I375c49e3604130dadfa180c765b14cb0a85ae90b with SHA-1 aacfe5f421 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12796232\n\nChange-Id: I09d759414146d6da2e3872706721008d4af5dcd7\n" }, { "commit": "1fdf972de4b71a0d8ea3bda3f197991b2ddab599", "tree": "461addbed55d7c08f13857fc628599b4e0dea404", "parents": [ "cc3575d2af08b440bc340913c33e89a74e79d9c9", "6da1fecdacafe81ae768fe982548f3e3e9bbbd85" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 02:35:00 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 02:35:00 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s ours am: 6da1fecdac -s ours\n\nam skip reason: Change-Id I375c49e3604130dadfa180c765b14cb0a85ae90b with SHA-1 aacfe5f421 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12796232\n\nChange-Id: If6c8d2b67aa6425e155876de06634be7324cacbd\n" }, { "commit": "6da1fecdacafe81ae768fe982548f3e3e9bbbd85", "tree": "461addbed55d7c08f13857fc628599b4e0dea404", "parents": [ "ca53b78f5cfb26574dd0335b5a9bd9bbd03ebab8", "f823643d8322ff182771185128acf6a1831b5171" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 02:10:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 02:10:01 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s ours\n\nam skip reason: Change-Id I375c49e3604130dadfa180c765b14cb0a85ae90b with SHA-1 aacfe5f421 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12796232\n\nChange-Id: I703c3359e8980b373c47514c11aa288bbd82c716\n" } ], "next": "f823643d8322ff182771185128acf6a1831b5171" }