)]}' { "log": [ { "commit": "208360bba3cae0953026dcf62809ddd3bc49ec9b", "tree": "4542a49f7f1b47d710878005f45c966aedb7dd22", "parents": [ "60656e32d1cf7ffb579cbc4257b78fdac61136c1" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Fri Jun 24 18:37:04 2022 +0000" }, "committer": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Fri Jun 24 21:40:56 2022 +0000" }, "message": "Do not transform values from a SOURCE_MOUSE_RELATIVE device\n\nIn Pointer Capture mode, we want the API to report events directly\nas they are coming from the kernel without any transformations.\nWe already do this for SORUCE_TOUCHPAD. Here, we update the handling\nof SOURCE_MOUSE_RELATIVE so that when Pointer Capture is enabled,\nmouse events are not effected by the display or window state.\n\nBug: 233184154\nTest: Apply non-standard scaling to a device using\n\"adb shell wm size\" and run: atest MicrosoftSculpttouchTest\nTest: atest libinput_tests\nTest: atest inputflinger_tests\n\nChange-Id: Ia6ef5a21312da949ac2704e9bfe4638626d3a894\n" }, { "commit": "60656e32d1cf7ffb579cbc4257b78fdac61136c1", "tree": "d87edbcc7fc448e29f85650c51c6d79796a4704e", "parents": [ "eb84c4213df7ee2bb93f6527377bc5bbf64b2ec7" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Fri Jun 24 18:19:55 2022 +0000" }, "committer": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Fri Jun 24 21:40:51 2022 +0000" }, "message": "Apply pointer capture changes only in mode POINTER_RELATIVE\n\nPointer Capture should not effect devices in NAVIGATION mode like\ntrackballs.\n\nThis CL also migrates the Pointer Mode enum to an enum class.\n\nBug: 233184154\nTest: presubmit\nChange-Id: Ic7a74588d44bd54086bd544c77880bd6037e5985\n" }, { "commit": "eb84c4213df7ee2bb93f6527377bc5bbf64b2ec7", "tree": "3c89e4b5a3981378e423cae1fde8bd802facef51", "parents": [ "b58cebaa55833842a18929e4476a98ced3050e88", "cc4795268a237c5321331203aeb612daad19fd9a" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Jun 20 13:43:51 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 20 13:43:51 2022 +0000" }, "message": "Merge \"Fix the shadow problem caused by layer parent switching\" am: 8ab01b202f am: 6d3c8a29d4 am: 8fce12b797 am: 1041b72bd8 am: cc4795268a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2075863\n\nChange-Id: I58a4d9905f4dd8bf441dca0a1773e9906f6b5efd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cc4795268a237c5321331203aeb612daad19fd9a", "tree": "1f026187ff0e7664417fec05effda867ddd3ab9c", "parents": [ "054c6a2c326b17394f5b4c3abf0240b10ddf6264", "1041b72bd8153448536d9e80946dd398aa8b57c2" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Jun 20 13:18:55 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 20 13:18:55 2022 +0000" }, "message": "Merge \"Fix the shadow problem caused by layer parent switching\" am: 8ab01b202f am: 6d3c8a29d4 am: 8fce12b797 am: 1041b72bd8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2075863\n\nChange-Id: I0077b1039e8757ce3c4d1d50198346e991959217\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1041b72bd8153448536d9e80946dd398aa8b57c2", "tree": "84937b78ad69fc72bc7adb1c668c3746d4f14ad9", "parents": [ "d729574a2d5a2d41bc9e0f3381ebdcebe6f9d95c", "8fce12b797d6cc676c2e543b1d2a74eafb54b8b2" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Jun 20 12:56:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 20 12:56:02 2022 +0000" }, "message": "Merge \"Fix the shadow problem caused by layer parent switching\" am: 8ab01b202f am: 6d3c8a29d4 am: 8fce12b797\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2075863\n\nChange-Id: I053dfa500d9d67c1f5acfbde4b0bf8ad104fd5c9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8fce12b797d6cc676c2e543b1d2a74eafb54b8b2", "tree": "84937b78ad69fc72bc7adb1c668c3746d4f14ad9", "parents": [ "b2f24d3fa56d2b297037af83d6d9ffad2af67830", "6d3c8a29d4a550945695a71c0a98e500530c769f" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Jun 20 12:30:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 20 12:30:08 2022 +0000" }, "message": "Merge \"Fix the shadow problem caused by layer parent switching\" am: 8ab01b202f am: 6d3c8a29d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2075863\n\nChange-Id: I25fb34506b3c116ab3d5fbab67f2666d48e35432\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6d3c8a29d4a550945695a71c0a98e500530c769f", "tree": "0edf6ebbd4cf188a3f8e8f30181896ed1c7d7d46", "parents": [ "caf1905a5dee9e816ccb4d34d2d3fda7632a75db", "8ab01b202fabb149ccb8e0f88e8836099cfcb6b4" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Jun 20 11:46:31 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 20 11:46:31 2022 +0000" }, "message": "Merge \"Fix the shadow problem caused by layer parent switching\" am: 8ab01b202f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2075863\n\nChange-Id: Ibb67e70d66bf4aa706caff6ac56985cbdd2e28f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8ab01b202fabb149ccb8e0f88e8836099cfcb6b4", "tree": "0edf6ebbd4cf188a3f8e8f30181896ed1c7d7d46", "parents": [ "7fd163e68ca865a3c43b781d8e4b497407d93964", "f4200e674fc272d7a2d564ed97c1a62c812525b4" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Jun 20 11:30:21 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 20 11:30:21 2022 +0000" }, "message": "Merge \"Fix the shadow problem caused by layer parent switching\"" }, { "commit": "b58cebaa55833842a18929e4476a98ced3050e88", "tree": "691bce6542e4c142707c2363a2d68e8bab75fe06", "parents": [ "6e37739561cb9c5db17bb18600547db7eb4dc917", "054c6a2c326b17394f5b4c3abf0240b10ddf6264" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 01:09:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 01:09:32 2022 +0000" }, "message": "Merge \"libbinder: Use correct data size in appendFrom test\" am: 7fd163e68c am: caf1905a5d am: b2f24d3fa5 am: d729574a2d am: 054c6a2c32\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128761\n\nChange-Id: I12e885a78ef00628ebae9355a6171bae68f31b13\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6e37739561cb9c5db17bb18600547db7eb4dc917", "tree": "4616bcc85e2a940d66f9649798cf01551861b295", "parents": [ "3cb16a46c6934338ce3906a56972f1ecf86d4d9c", "98af673ba77bb751403cb561a56485f5d7b2ced9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 01:09:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 01:09:00 2022 +0000" }, "message": "Merge \"libbinder_rs: Handle empty args list for dump transactions\" am: 5500a7b14a am: bb1de46d6f am: 52943c5ffe am: 1f32d1306d am: 98af673ba7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128760\n\nChange-Id: I65935e813a4e250737bf7daa3e6874e545773893\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "054c6a2c326b17394f5b4c3abf0240b10ddf6264", "tree": "3e46f1d265603fe1e65c396b22b302b55ae0dfa3", "parents": [ "98af673ba77bb751403cb561a56485f5d7b2ced9", "d729574a2d5a2d41bc9e0f3381ebdcebe6f9d95c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 00:51:53 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 00:51:53 2022 +0000" }, "message": "Merge \"libbinder: Use correct data size in appendFrom test\" am: 7fd163e68c am: caf1905a5d am: b2f24d3fa5 am: d729574a2d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128761\n\nChange-Id: Ie0102fdfb176a84267661d5507393dfca5f4004e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "98af673ba77bb751403cb561a56485f5d7b2ced9", "tree": "c193b8dc9e82e8fb5c90afa93b58b341249018ab", "parents": [ "1ad532a7cc38ed81abd3e33ed976219551af838b", "1f32d1306dfb29f261c1f12170188c4963bee1da" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 00:51:24 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 00:51:24 2022 +0000" }, "message": "Merge \"libbinder_rs: Handle empty args list for dump transactions\" am: 5500a7b14a am: bb1de46d6f am: 52943c5ffe am: 1f32d1306d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128760\n\nChange-Id: I8ccb1de05e3436ec385198f74608516c65565b3d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d729574a2d5a2d41bc9e0f3381ebdcebe6f9d95c", "tree": "60c18e638f8b1ec0243becef464376a915b7eb08", "parents": [ "1f32d1306dfb29f261c1f12170188c4963bee1da", "b2f24d3fa56d2b297037af83d6d9ffad2af67830" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 00:36:05 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 00:36:05 2022 +0000" }, "message": "Merge \"libbinder: Use correct data size in appendFrom test\" am: 7fd163e68c am: caf1905a5d am: b2f24d3fa5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128761\n\nChange-Id: I76239462c24b2b453f56448a70786cbc4d956027\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1f32d1306dfb29f261c1f12170188c4963bee1da", "tree": "d24a302924be4be58d116fc1a8e24bdc5054bf8e", "parents": [ "4fa69a344361e0acdc212aa0797c50f579826e42", "52943c5ffe50887fb6332cf0c38385272297059e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 00:35:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 00:35:57 2022 +0000" }, "message": "Merge \"libbinder_rs: Handle empty args list for dump transactions\" am: 5500a7b14a am: bb1de46d6f am: 52943c5ffe\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128760\n\nChange-Id: Id88b22fb2a8e0cf3a6f5bf7f00ea4da0adc06714\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b2f24d3fa56d2b297037af83d6d9ffad2af67830", "tree": "60c18e638f8b1ec0243becef464376a915b7eb08", "parents": [ "52943c5ffe50887fb6332cf0c38385272297059e", "caf1905a5dee9e816ccb4d34d2d3fda7632a75db" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 00:08:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 00:08:32 2022 +0000" }, "message": "Merge \"libbinder: Use correct data size in appendFrom test\" am: 7fd163e68c am: caf1905a5d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128761\n\nChange-Id: I6ad9ba70909c6001621e9f1fd447f646c3fcc66e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "52943c5ffe50887fb6332cf0c38385272297059e", "tree": "d24a302924be4be58d116fc1a8e24bdc5054bf8e", "parents": [ "8849f4b784201e39324cbbfac4fec03f8827b94a", "bb1de46d6f58f1cb866e09e8a9546100a69a7b34" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 18 00:08:23 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 18 00:08:23 2022 +0000" }, "message": "Merge \"libbinder_rs: Handle empty args list for dump transactions\" am: 5500a7b14a am: bb1de46d6f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128760\n\nChange-Id: I865170a6b87d807b8e38dd9eceabefb5073ff4d2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "caf1905a5dee9e816ccb4d34d2d3fda7632a75db", "tree": "2eaac4334424b0470b049c2a3c9bae222a105ca1", "parents": [ "bb1de46d6f58f1cb866e09e8a9546100a69a7b34", "7fd163e68ca865a3c43b781d8e4b497407d93964" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 23:38:44 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 23:38:44 2022 +0000" }, "message": "Merge \"libbinder: Use correct data size in appendFrom test\" am: 7fd163e68c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128761\n\nChange-Id: I4737b33a172eb823af8430776b871b82f6d186b5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb1de46d6f58f1cb866e09e8a9546100a69a7b34", "tree": "d1c6593231ead8312d4502103854eade95f5b341", "parents": [ "4c2b547d7e3974bbb9a19574a71ecd27a9dfcacb", "5500a7b14a3b7d83be8a36f6dd7621a3728de176" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 23:38:34 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 23:38:34 2022 +0000" }, "message": "Merge \"libbinder_rs: Handle empty args list for dump transactions\" am: 5500a7b14a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128760\n\nChange-Id: I14c28b6e43c2d0c8d56d3e377f96ecc6800cc449\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7fd163e68ca865a3c43b781d8e4b497407d93964", "tree": "2eaac4334424b0470b049c2a3c9bae222a105ca1", "parents": [ "5500a7b14a3b7d83be8a36f6dd7621a3728de176", "a4ed5674cd4ef9a61bb34711813085d5205cbf31" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 23:33:14 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 17 23:33:14 2022 +0000" }, "message": "Merge \"libbinder: Use correct data size in appendFrom test\"" }, { "commit": "5500a7b14a3b7d83be8a36f6dd7621a3728de176", "tree": "d1c6593231ead8312d4502103854eade95f5b341", "parents": [ "939a6e840405d6e2c35b9ea553f1a83f7d4f88e6", "0c5f923dd68d31482741ca4b44bbec80eef2fe9d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 23:18:34 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 17 23:18:34 2022 +0000" }, "message": "Merge \"libbinder_rs: Handle empty args list for dump transactions\"" }, { "commit": "3cb16a46c6934338ce3906a56972f1ecf86d4d9c", "tree": "a39fc4fdf04c05e3e575f9aa3cce6810c25ee25c", "parents": [ "45ee8294655fe773fdc17fbd8aed93625d86a596", "1ad532a7cc38ed81abd3e33ed976219551af838b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 23:01:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 23:01:57 2022 +0000" }, "message": "Merge \"GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING\" am: 939a6e8404 am: 4c2b547d7e am: 8849f4b784 am: 4fa69a3443 am: 1ad532a7cc\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128448\n\nChange-Id: I5890c30df27facf49932503036289d3de2ec9274\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "45ee8294655fe773fdc17fbd8aed93625d86a596", "tree": "532f6bd05515292787a6f40e8217b39212b99e1a", "parents": [ "089b8e3d9ca108c858c43d2ab892ad0f97e0f319", "af507bc5b67b2c878fc4957411bd2bc0667ac7c4" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 22:58:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:58:42 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Skip SQ3A.220605.009\" am: d05c0b9365 -s ours am: 21377beb26 -s ours am: 9992e58241 -s ours am: 950463a6bf -s ours am: af507bc5b6 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: I11b9acf8adb0f930c64e783dd56a68a892789013\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "089b8e3d9ca108c858c43d2ab892ad0f97e0f319", "tree": "532f6bd05515292787a6f40e8217b39212b99e1a", "parents": [ "dd0c5287b0d43abb8c7bf414df9977b0c7a37ace", "b430435df13a17995a14ac9af3562b79d7e1f2f6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 22:57:50 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:57:50 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 1ea706ef47 -s ours am: 525ca621af -s ours am: edf7774ebf -s ours am: acf9c8ee6a -s ours am: b430435df1 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: If47a77a529843998407e7f1b36566b431ccf0a7b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dd0c5287b0d43abb8c7bf414df9977b0c7a37ace", "tree": "532f6bd05515292787a6f40e8217b39212b99e1a", "parents": [ "aa4f219dc990f45405ed162db5343477c1ac3f1f", "e3f4cd71fe698b72f818c76fed76083bb768ec87" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 22:36:41 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:36:41 2022 +0000" }, "message": "Merge \"GpuMemTracerTest - switch mTestMap bpfmap init to move assignment\" am: b69a669d59 am: b4bd6b5123 am: 4897a0c593 am: c213090021 am: e3f4cd71fe\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129778\n\nChange-Id: I409f59875a603c15b64a70534ef3e598ddd25961\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1ad532a7cc38ed81abd3e33ed976219551af838b", "tree": "aa167bed3ec53cf4d56272955a56266fd6167348", "parents": [ "af507bc5b67b2c878fc4957411bd2bc0667ac7c4", "4fa69a344361e0acdc212aa0797c50f579826e42" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 22:36:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:36:16 2022 +0000" }, "message": "Merge \"GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING\" am: 939a6e8404 am: 4c2b547d7e am: 8849f4b784 am: 4fa69a3443\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128448\n\nChange-Id: I97d9d5f622c05b64de49c81cb757741e7ab10a65\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "af507bc5b67b2c878fc4957411bd2bc0667ac7c4", "tree": "5338209730b7ea6beb302a87f47c23495e48ddc3", "parents": [ "b430435df13a17995a14ac9af3562b79d7e1f2f6", "950463a6bf85bef134cdb7a12397d312e08be1fa" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 22:32:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:32:57 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Skip SQ3A.220605.009\" am: d05c0b9365 -s ours am: 21377beb26 -s ours am: 9992e58241 -s ours am: 950463a6bf -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: I24504825e987830685887bf9316c2c809532e893\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b430435df13a17995a14ac9af3562b79d7e1f2f6", "tree": "5338209730b7ea6beb302a87f47c23495e48ddc3", "parents": [ "e3f4cd71fe698b72f818c76fed76083bb768ec87", "acf9c8ee6a2130d466b87d3d0ea45e4af3d05419" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 22:32:05 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:32:05 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 1ea706ef47 -s ours am: 525ca621af -s ours am: edf7774ebf -s ours am: acf9c8ee6a -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: I19cbcc14bd29fd4aec67b925c816f95d52471c56\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aa4f219dc990f45405ed162db5343477c1ac3f1f", "tree": "ad311a9a08a49111a877458d1a743ebbc0deb2bb", "parents": [ "7a95fa7fcb86236310630b0f5e3493228726a11f", "12d6aea180376ded88dab2faa7d15897c8cdb2f8" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 22:31:09 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:31:09 2022 +0000" }, "message": "Merge \"GpuMemTest - switch mTestMap bpfmap init to move assignment\" am: 02983cc9b8 am: 824771b88e am: 0684601024 am: c275c9724f am: 12d6aea180\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129832\n\nChange-Id: I4df7b36d6cdb5b3a4a77834a2b53aebe21369479\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7a95fa7fcb86236310630b0f5e3493228726a11f", "tree": "b109407a9734d0fbbe5556276a5723a31d92bf86", "parents": [ "fb55f8a7b9a7663dd6b65fe35d1fba83b8622395", "21fcc2b181c431210d0d976c7898058751c7d555" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Fri Jun 17 22:10:40 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 17 22:10:40 2022 +0000" }, "message": "Merge \"Revert \"Check whether pointer has stopped at liftoff\"\"" }, { "commit": "a4ed5674cd4ef9a61bb34711813085d5205cbf31", "tree": "d8deaf5c4ca31b4da3fdd004089b5b0151942d01", "parents": [ "d05c0b93659d3880a6c4411e1352c9f1d750f2f1" ], "author": { "name": "Frederick Mayle", "email": "fmayle@google.com", "time": "Fri Jun 17 22:03:38 2022 +0000" }, "committer": { "name": "Frederick Mayle", "email": "fmayle@google.com", "time": "Fri Jun 17 22:09:03 2022 +0000" }, "message": "libbinder: Use correct data size in appendFrom test\n\nI noticed this because I had temporarily changed the order of the checks\nfor a WIP CL and this started failed in the wrong way.\n\nThere is a fuzzer for appendFrom, so this shouldn\u0027t be a loss of\ncoverage for the bad data size case.\n\nTest: binderRpcTest\nChange-Id: Ia86681c59b2f814f93298d2837d8dcb03c84bdb0\n" }, { "commit": "4fa69a344361e0acdc212aa0797c50f579826e42", "tree": "f52f3a9bbcd252c634f724cc2e8dcd0976b0853e", "parents": [ "950463a6bf85bef134cdb7a12397d312e08be1fa", "8849f4b784201e39324cbbfac4fec03f8827b94a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 22:06:39 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:06:39 2022 +0000" }, "message": "Merge \"GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING\" am: 939a6e8404 am: 4c2b547d7e am: 8849f4b784\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128448\n\nChange-Id: I10d385a5f90cbf1b8d880a861c2cc852456999e1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "950463a6bf85bef134cdb7a12397d312e08be1fa", "tree": "597a34c5d988ab3e6b3d0978a4cfb4996a5eaca2", "parents": [ "acf9c8ee6a2130d466b87d3d0ea45e4af3d05419", "9992e58241d6b493115c5e5a08a03029c1e99a16" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 22:03:27 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:03:27 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Skip SQ3A.220605.009\" am: d05c0b9365 -s ours am: 21377beb26 -s ours am: 9992e58241 -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: If61cacc42cc97b5dd6f85d421d4ff85b35f7b68c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "acf9c8ee6a2130d466b87d3d0ea45e4af3d05419", "tree": "597a34c5d988ab3e6b3d0978a4cfb4996a5eaca2", "parents": [ "c213090021d8f1f75fa4076f286f994a60211640", "edf7774ebf7b07bcf0876134774ead839916a284" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 22:02:36 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:02:36 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 1ea706ef47 -s ours am: 525ca621af -s ours am: edf7774ebf -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: Iffd7dcc653b97c736b487c4dae441fb754e0c06c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e3f4cd71fe698b72f818c76fed76083bb768ec87", "tree": "5338209730b7ea6beb302a87f47c23495e48ddc3", "parents": [ "12d6aea180376ded88dab2faa7d15897c8cdb2f8", "c213090021d8f1f75fa4076f286f994a60211640" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 22:02:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:02:15 2022 +0000" }, "message": "Merge \"GpuMemTracerTest - switch mTestMap bpfmap init to move assignment\" am: b69a669d59 am: b4bd6b5123 am: 4897a0c593 am: c213090021\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129778\n\nChange-Id: Ia2d6b7068d940cc79e2e087bf4651ab0b251cad2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "12d6aea180376ded88dab2faa7d15897c8cdb2f8", "tree": "73f77d053c07b83dda1f34c2cd32e65cf0e0a0ce", "parents": [ "b261389b837352d324295df7e7de5243f74b7780", "c275c9724f24d8602b037e9b7aea6f3ade379a6f" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 22:01:22 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 22:01:22 2022 +0000" }, "message": "Merge \"GpuMemTest - switch mTestMap bpfmap init to move assignment\" am: 02983cc9b8 am: 824771b88e am: 0684601024 am: c275c9724f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129832\n\nChange-Id: Ib5495a0dbc8c655b52c1034eccac2ff21d6876c7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c213090021d8f1f75fa4076f286f994a60211640", "tree": "597a34c5d988ab3e6b3d0978a4cfb4996a5eaca2", "parents": [ "c275c9724f24d8602b037e9b7aea6f3ade379a6f", "4897a0c593a2821529e452cdef76b691cda5a48a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 21:54:45 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:54:45 2022 +0000" }, "message": "Merge \"GpuMemTracerTest - switch mTestMap bpfmap init to move assignment\" am: b69a669d59 am: b4bd6b5123 am: 4897a0c593\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129778\n\nChange-Id: I8cf2ea3548efa4eb16a22a7d4c1dbfe4ac0acd33\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c275c9724f24d8602b037e9b7aea6f3ade379a6f", "tree": "38c35e4a8d801ef3181522332738eca3da5a446e", "parents": [ "d392b28abec5fbe8fc1c0566e1f18985beeefba8", "0684601024477198dafcf5fc5d9687886a863098" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 21:44:20 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:44:20 2022 +0000" }, "message": "Merge \"GpuMemTest - switch mTestMap bpfmap init to move assignment\" am: 02983cc9b8 am: 824771b88e am: 0684601024\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129832\n\nChange-Id: Idfb121dbd922d0bb941ece2de2c9ab064d75a624\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fb55f8a7b9a7663dd6b65fe35d1fba83b8622395", "tree": "5adaaab28b3fb4681d0935a2354b83fb679f98c5", "parents": [ "f72d873930f692e8f7f15925f4dbf12bd030a5d4", "b261389b837352d324295df7e7de5243f74b7780" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 21:34:41 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:34:41 2022 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12 QPR 3\" am: 099a4648fd -s ours am: 53182e4f36 -s ours am: 5dcd20e406 -s ours am: d392b28abe -s ours am: b261389b83 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: Iee62641c18c5ccbb96632c19ceadee49147d9ca6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f72d873930f692e8f7f15925f4dbf12bd030a5d4", "tree": "5adaaab28b3fb4681d0935a2354b83fb679f98c5", "parents": [ "91823a04586cbeade194e6b78b286a688ed40efe", "f7db9d97754ad5224e973723e5d7e653ebf5ed60" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 21:33:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:33:30 2022 +0000" }, "message": "[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa51 -s ours am: a9dbc49ee3 -s ours am: 7769e9f141 -s ours am: 80ad01c3b1 -s ours am: f7db9d9775 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: I1712ce143c1f49fcfe8ea440a0804e306fab810c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8849f4b784201e39324cbbfac4fec03f8827b94a", "tree": "f52f3a9bbcd252c634f724cc2e8dcd0976b0853e", "parents": [ "9992e58241d6b493115c5e5a08a03029c1e99a16", "4c2b547d7e3974bbb9a19574a71ecd27a9dfcacb" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 21:31:33 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:31:33 2022 +0000" }, "message": "Merge \"GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING\" am: 939a6e8404 am: 4c2b547d7e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128448\n\nChange-Id: I269a0208b24c799764faa1509e50ceaff92b8733\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21fcc2b181c431210d0d976c7898058751c7d555", "tree": "2de901270500a6742cd639ae652be69240918fb5", "parents": [ "456acaae9592985f6424cd244c55de9982537f42" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Fri Jun 17 21:29:02 2022 +0000" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Fri Jun 17 21:29:02 2022 +0000" }, "message": "Revert \"Check whether pointer has stopped at liftoff\"\n\nThis reverts commit 456acaae9592985f6424cd244c55de9982537f42.\nTest: not tested, this is a revert\nBug: 236335820\nReason for revert: breaks NumberPickerTest\n\nChange-Id: I9b1e2002c51e96c52b7bb13f55ae1331ffb4915b\n" }, { "commit": "9992e58241d6b493115c5e5a08a03029c1e99a16", "tree": "597a34c5d988ab3e6b3d0978a4cfb4996a5eaca2", "parents": [ "edf7774ebf7b07bcf0876134774ead839916a284", "21377beb261d97575cc78cbfc46ec85699fea1b6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 21:28:21 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:28:21 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Skip SQ3A.220605.009\" am: d05c0b9365 -s ours am: 21377beb26 -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: I033ff1d47af07911dea6d5ac2054e562c47fbecb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "edf7774ebf7b07bcf0876134774ead839916a284", "tree": "597a34c5d988ab3e6b3d0978a4cfb4996a5eaca2", "parents": [ "4897a0c593a2821529e452cdef76b691cda5a48a", "525ca621af7de271de12bbffb3610375abb5d5cc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 21:27:28 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:27:28 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 1ea706ef47 -s ours am: 525ca621af -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: I21a9325185494112a98c1801668da02341de20de\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91823a04586cbeade194e6b78b286a688ed40efe", "tree": "5adaaab28b3fb4681d0935a2354b83fb679f98c5", "parents": [ "da7c353f249464e3f693a81ee4fe637617a69f76", "37ce3ecd9268adead6d04ae8211443eaded20ae5" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Fri Jun 17 21:25:19 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 17 21:25:19 2022 +0000" }, "message": "Merge \"SurfaceFlinger: Remove BufferQueueLayer\"" }, { "commit": "4897a0c593a2821529e452cdef76b691cda5a48a", "tree": "597a34c5d988ab3e6b3d0978a4cfb4996a5eaca2", "parents": [ "0684601024477198dafcf5fc5d9687886a863098", "b4bd6b512364124c17cb687fabce0e7bb8ef960e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 21:20:09 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:20:09 2022 +0000" }, "message": "Merge \"GpuMemTracerTest - switch mTestMap bpfmap init to move assignment\" am: b69a669d59 am: b4bd6b5123\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129778\n\nChange-Id: I82a23fd93445626e1eb31355976294226a113d3b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0684601024477198dafcf5fc5d9687886a863098", "tree": "38c35e4a8d801ef3181522332738eca3da5a446e", "parents": [ "5dcd20e40669d131670b9cb105eff16c2ccc2fe6", "824771b88e455ea7aab5eca08312d622eb0ad4e2" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 21:19:58 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:19:58 2022 +0000" }, "message": "Merge \"GpuMemTest - switch mTestMap bpfmap init to move assignment\" am: 02983cc9b8 am: 824771b88e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129832\n\nChange-Id: Ie31a01d1ae5b40dc4ced131b98b76fd3a7374532\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4c2b547d7e3974bbb9a19574a71ecd27a9dfcacb", "tree": "3b3646ec2ff2ea54918cee5de141eafc0f4a3f03", "parents": [ "21377beb261d97575cc78cbfc46ec85699fea1b6", "939a6e840405d6e2c35b9ea553f1a83f7d4f88e6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 21:06:40 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 21:06:40 2022 +0000" }, "message": "Merge \"GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING\" am: 939a6e8404\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128448\n\nChange-Id: I286c6b1901a24c70c2bb2b64260d98479618ed2b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b261389b837352d324295df7e7de5243f74b7780", "tree": "cf88be90b668eaffc45bc4289233e9b10b9b0bcd", "parents": [ "f7db9d97754ad5224e973723e5d7e653ebf5ed60", "d392b28abec5fbe8fc1c0566e1f18985beeefba8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 20:53:51 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 20:53:51 2022 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12 QPR 3\" am: 099a4648fd -s ours am: 53182e4f36 -s ours am: 5dcd20e406 -s ours am: d392b28abe -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: Id966fad0c42e71382870f464808fc222d61f3719\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "939a6e840405d6e2c35b9ea553f1a83f7d4f88e6", "tree": "3b3646ec2ff2ea54918cee5de141eafc0f4a3f03", "parents": [ "d05c0b93659d3880a6c4411e1352c9f1d750f2f1", "842ec2d4c7be3dde4560ff4fac73b582817bae7c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 20:53:08 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 17 20:53:08 2022 +0000" }, "message": "Merge \"GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING\"" }, { "commit": "f7db9d97754ad5224e973723e5d7e653ebf5ed60", "tree": "cf88be90b668eaffc45bc4289233e9b10b9b0bcd", "parents": [ "e90fac4550bcbcfbc2cbfe01478cd85fc10b420c", "80ad01c3b1adb5ec14e38878ea8e7956e485d897" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 20:52:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 20:52:38 2022 +0000" }, "message": "[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa51 -s ours am: a9dbc49ee3 -s ours am: 7769e9f141 -s ours am: 80ad01c3b1 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: I2a65c171a83523942fe6a46dafbbcc1a710141ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "da7c353f249464e3f693a81ee4fe637617a69f76", "tree": "c6397a5ca797a4a22d2502fb612f7ff384569c7f", "parents": [ "b2eb17e12bbfe8f7095fec060f4cc5f1af693bcc", "e90fac4550bcbcfbc2cbfe01478cd85fc10b420c" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Fri Jun 17 20:31:35 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 20:31:35 2022 +0000" }, "message": "[automerger skipped] Do not load keylayout if required kernel module is missing am: d945d3e55e am: 8d74e0c14e am: e90fac4550 -s ours\n\nam skip reason: Merged-In I0d2ab6298bd41df6dc56120bf0385e10da6c3bfe with SHA-1 a9fd82c447 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18930810\n\nChange-Id: Ibb85b7bbbee3f94bb4991b956a6d05cb9de9baff\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21377beb261d97575cc78cbfc46ec85699fea1b6", "tree": "ee782f153d119affdbefa0158a5e7f1c913e35c6", "parents": [ "525ca621af7de271de12bbffb3610375abb5d5cc", "d05c0b93659d3880a6c4411e1352c9f1d750f2f1" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 20:07:26 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 20:07:26 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Skip SQ3A.220605.009\" am: d05c0b9365 -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: I6f9daefc9021f4ed9bcbe1c43381e5d1409c1181\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "525ca621af7de271de12bbffb3610375abb5d5cc", "tree": "ee782f153d119affdbefa0158a5e7f1c913e35c6", "parents": [ "b4bd6b512364124c17cb687fabce0e7bb8ef960e", "1ea706ef4725fd8ebefcf2fb955c8582347383a6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 20:06:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 20:06:32 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 1ea706ef47 -s ours\n\nam skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478\n\nChange-Id: I103dbdb0405627934caff615be11c25f1cad8dda\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e90fac4550bcbcfbc2cbfe01478cd85fc10b420c", "tree": "cf88be90b668eaffc45bc4289233e9b10b9b0bcd", "parents": [ "0d837ac2def4842436fb7a64d96c8ebe11b42638", "8d74e0c14ed5830f0c6bd43d2f8956c8df73be7d" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Fri Jun 17 20:03:43 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 20:03:43 2022 +0000" }, "message": "Do not load keylayout if required kernel module is missing am: d945d3e55e am: 8d74e0c14e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18930810\n\nChange-Id: I3176da85ebf5e499534df62294062b92f7a26520\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d392b28abec5fbe8fc1c0566e1f18985beeefba8", "tree": "3495973415e51d81fd3113af36d89533fbcce665", "parents": [ "80ad01c3b1adb5ec14e38878ea8e7956e485d897", "5dcd20e40669d131670b9cb105eff16c2ccc2fe6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 19:57:29 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 19:57:29 2022 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12 QPR 3\" am: 099a4648fd -s ours am: 53182e4f36 -s ours am: 5dcd20e406 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: Ie3188486334bc0878a28e00915c528f81a4199f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "80ad01c3b1adb5ec14e38878ea8e7956e485d897", "tree": "3495973415e51d81fd3113af36d89533fbcce665", "parents": [ "8d74e0c14ed5830f0c6bd43d2f8956c8df73be7d", "7769e9f1418a6c8a980a04868cf4422652ec9de3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 19:56:20 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 19:56:20 2022 +0000" }, "message": "[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa51 -s ours am: a9dbc49ee3 -s ours am: 7769e9f141 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: I1c79edbf993fc52a74254e560864c7ac33da6f2d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4bd6b512364124c17cb687fabce0e7bb8ef960e", "tree": "ee782f153d119affdbefa0158a5e7f1c913e35c6", "parents": [ "824771b88e455ea7aab5eca08312d622eb0ad4e2", "b69a669d59865fd404eed71ad52b05c4dee013e2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 19:48:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 19:48:37 2022 +0000" }, "message": "Merge \"GpuMemTracerTest - switch mTestMap bpfmap init to move assignment\" am: b69a669d59\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129778\n\nChange-Id: I4cfe5ae5f30eb10a241a05805869902e18ec9ec7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "824771b88e455ea7aab5eca08312d622eb0ad4e2", "tree": "c2538b419ea3e8b2e4ed9711e13f534d52464bb2", "parents": [ "53182e4f36b7ea755bfb90efcbd1836832478a02", "02983cc9b8f8dbc3d40797b2aae0dea3315fcdf4" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 19:48:26 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 19:48:26 2022 +0000" }, "message": "Merge \"GpuMemTest - switch mTestMap bpfmap init to move assignment\" am: 02983cc9b8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2129832\n\nChange-Id: I1530def2328f43ebfb090a562b8b3b82ff8b242a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8d74e0c14ed5830f0c6bd43d2f8956c8df73be7d", "tree": "3495973415e51d81fd3113af36d89533fbcce665", "parents": [ "a365de7ae77c675414880ec50b2ec2b644b19c63", "d945d3e55ecd98d6554a9fdf6dfa1beb1c64a189" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Fri Jun 17 19:39:53 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 19:39:53 2022 +0000" }, "message": "Do not load keylayout if required kernel module is missing am: d945d3e55e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18930810\n\nChange-Id: Id21544273ddbb1dab9241bd7acafe2766dd9540c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0c5f923dd68d31482741ca4b44bbec80eef2fe9d", "tree": "a017a3bbba130317a27be6a668708fedce7a50aa", "parents": [ "d05c0b93659d3880a6c4411e1352c9f1d750f2f1" ], "author": { "name": "Stephen Crane", "email": "cranes@google.com", "time": "Fri Jun 17 11:48:05 2022 -0700" }, "committer": { "name": "Stephen Crane", "email": "cranes@google.com", "time": "Fri Jun 17 11:58:58 2022 -0700" }, "message": "libbinder_rs: Handle empty args list for dump transactions\n\nPreviously we expected the args pointer passed to the handler for dump\ntransactions to be non-null. If there are no arguments this\npointer may be null and we should pass an empty args list instead of\nerroring out.\n\nBug: 232887857\nTest: atest -p frameworks/native/libs/binder\nTest: cts -m CtsSecurityTestCases -t android.security.cts.ServicePermissionsTest#testDumpProtected\nChange-Id: If2b08c688a374913ef0913749efc72db07e7776f\n" }, { "commit": "b2eb17e12bbfe8f7095fec060f4cc5f1af693bcc", "tree": "c6397a5ca797a4a22d2502fb612f7ff384569c7f", "parents": [ "55b2c0b5e9e0be0d35775dfa2ca958ae7ca0b9b1", "74007943350ce4673e5611f5f3b58d56d9e6a5fc" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 15:31:38 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 17 15:31:38 2022 +0000" }, "message": "Merge \"Use std::vector when sending keyCodes\"" }, { "commit": "d05c0b93659d3880a6c4411e1352c9f1d750f2f1", "tree": "ee782f153d119affdbefa0158a5e7f1c913e35c6", "parents": [ "b69a669d59865fd404eed71ad52b05c4dee013e2", "1ea706ef4725fd8ebefcf2fb955c8582347383a6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 14:29:01 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 17 14:29:01 2022 +0000" }, "message": "Merge \"DO NOT MERGE - Skip SQ3A.220605.009\"" }, { "commit": "f4200e674fc272d7a2d564ed97c1a62c812525b4", "tree": "9e73a5318f495963a818557f06b3f967377dcc8c", "parents": [ "b86796a06f9c9f03211f0fad086100987f530005" ], "author": { "name": "xinying1", "email": "xinying1@xiaomi.corp-partner.google.com", "time": "Tue Apr 26 14:41:30 2022 +0800" }, "committer": { "name": "Ying Xin", "email": "xinying1@xiaomi.corp-partner.google.com", "time": "Fri Jun 17 06:20:13 2022 +0000" }, "message": "Fix the shadow problem caused by layer parent switching\n\nWhen the parent of a layer changes, shadowRadius should\nnot be directly passed in the computBounds here.\n\nWhen the layer\u0027s parent changes, for example, open an app\nin freeform. If the app exits the current ActivityRecord, it will\ntrigger the recent task request screen capture of the\ncurrent app, temporarily switch the task of the app to\n\"Screenshot Parent\", and then switch back. This operation\nwill cause the shadow of the task to be passed to the children layers\nthrough CanDrawShadows, i.e., the shadow of non Container layer\nis wrongly passed to its children layers.\nTherefore, there is a problem in shadow drawing.\n\nWe should judge whether shadowRadius needs to be passed\nat this time through CanDrawShadows. If not, pass 0.f.\n\nOtherwise, the shadow will be painted repeatedly.\n\nbug:215476160 in partnerissuetracker\n\nSigned-off-by: xinying1 \u003cxinying1@xiaomi.corp-partner.google.com\u003e\nChange-Id: Id4b6c8bcc79aa68f96d0c4c655ea853361ed1e7c\n" }, { "commit": "1ea706ef4725fd8ebefcf2fb955c8582347383a6", "tree": "ee782f153d119affdbefa0158a5e7f1c913e35c6", "parents": [ "b69a669d59865fd404eed71ad52b05c4dee013e2", "5361fff6a8904b09d619f4b929c40cb10167125f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 16 22:50:43 2022 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 16 22:50:43 2022 -0700" }, "message": "DO NOT MERGE - Skip SQ3A.220605.009\n\nBug: 236045730\nMerged-In: I424f45bc30ea8e56e4c4493203ee0749eabf239c\nChange-Id: If44bd1e285b61836eb655e41bf6d3b5f51af0426\n" }, { "commit": "842ec2d4c7be3dde4560ff4fac73b582817bae7c", "tree": "f5ef64562f6f2c165ea4e307e341c07c1f45a0d0", "parents": [ "2fd11cca9c4eef0d71647e882835b2ee42a63b7b" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jun 16 18:52:17 2022 +0000" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 05:21:55 2022 +0000" }, "message": "GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING\n\nGpuMem(Tracer)Test.setup() create new BpfMaps at run time\n(without the use of the boot time BpfLoader)\n\nBug: 236285127\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ic25b718f66a6a9d03ed80421becf06c5aecc0e32\n" }, { "commit": "b69a669d59865fd404eed71ad52b05c4dee013e2", "tree": "ee782f153d119affdbefa0158a5e7f1c913e35c6", "parents": [ "02983cc9b8f8dbc3d40797b2aae0dea3315fcdf4", "92f083d367f5df8c4a0903d927a3db9770679936" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 03:40:12 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 17 03:40:12 2022 +0000" }, "message": "Merge \"GpuMemTracerTest - switch mTestMap bpfmap init to move assignment\"" }, { "commit": "02983cc9b8f8dbc3d40797b2aae0dea3315fcdf4", "tree": "c2538b419ea3e8b2e4ed9711e13f534d52464bb2", "parents": [ "099a4648fdf4f261f70ca63920d24ba963d652f8", "d2d09358c143e435406e9f49f3ec9cdcef352093" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 01:46:57 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 17 01:46:57 2022 +0000" }, "message": "Merge \"GpuMemTest - switch mTestMap bpfmap init to move assignment\"" }, { "commit": "55b2c0b5e9e0be0d35775dfa2ca958ae7ca0b9b1", "tree": "9893df7789bac750d4a67c4667a9d03fb4d4e9a8", "parents": [ "715b4413b93d90c9d2a1f559c9b0fac69dd09f4f", "456acaae9592985f6424cd244c55de9982537f42" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 00:17:49 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 17 00:17:49 2022 +0000" }, "message": "Merge \"Check whether pointer has stopped at liftoff\"" }, { "commit": "5dcd20e40669d131670b9cb105eff16c2ccc2fe6", "tree": "3495973415e51d81fd3113af36d89533fbcce665", "parents": [ "7769e9f1418a6c8a980a04868cf4422652ec9de3", "53182e4f36b7ea755bfb90efcbd1836832478a02" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 00:15:27 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 00:15:27 2022 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12 QPR 3\" am: 099a4648fd -s ours am: 53182e4f36 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: I795f4cdc3e6f1a7d47a58bdede0557be14acbb12\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7769e9f1418a6c8a980a04868cf4422652ec9de3", "tree": "3495973415e51d81fd3113af36d89533fbcce665", "parents": [ "d945d3e55ecd98d6554a9fdf6dfa1beb1c64a189", "a9dbc49ee3d32a677494d93e1dca510c4ca9455b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 17 00:14:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 00:14:15 2022 +0000" }, "message": "[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa51 -s ours am: a9dbc49ee3 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: I0cd1954171e5b80fb1d7c4694befcc855a3a9c07\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "92f083d367f5df8c4a0903d927a3db9770679936", "tree": "73e5536205a38cab08a53182e80f5d7662738453", "parents": [ "099a4648fdf4f261f70ca63920d24ba963d652f8" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jun 16 23:58:39 2022 +0000" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Jun 17 00:00:19 2022 +0000" }, "message": "GpuMemTracerTest - switch mTestMap bpfmap init to move assignment\n\nalso remove use of .getMap() which I want to remove as it exposes fds and can leak\n(isValid check in the next line is equivalent)\n\nBug: 236285127\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I4a8a3b918f25501ab0ab4aa74ce5d2a629ece463\n" }, { "commit": "d2d09358c143e435406e9f49f3ec9cdcef352093", "tree": "c2538b419ea3e8b2e4ed9711e13f534d52464bb2", "parents": [ "099a4648fdf4f261f70ca63920d24ba963d652f8" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jun 16 19:08:28 2022 +0000" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jun 16 23:59:57 2022 +0000" }, "message": "GpuMemTest - switch mTestMap bpfmap init to move assignment\n\nalso remove use of .getMap() which I want to remove as it exposes fds\nand can leak (isValid check in the next line is equivalent)\n\nBug: 236285127\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ib5e1430acba423fa3d0373833411d44fe7cdde2a\n" }, { "commit": "74007943350ce4673e5611f5f3b58d56d9e6a5fc", "tree": "47269813c3470e0236cdee98c89dc28cfdb39754", "parents": [ "456acaae9592985f6424cd244c55de9982537f42" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Mon Jun 13 13:57:47 2022 -0700" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Thu Jun 16 15:49:22 2022 -0700" }, "message": "Use std::vector when sending keyCodes\n\nWe are currently sending a raw pointer to keyCodes and a size. The size\nis also used for outFlags, but it\u0027s not well-documented anyways.\n\nEventually, we may want to just return the flags instead of returning\nthe boolean.\n\nFor now, though, just change the incoming parameter to a vector to make\nit less errorprone.\n\nBug: 228005926\nTest: atest libinput_tests inputflinger_tests\nChange-Id: I6cc2f5d9b3b7b7c3c120a779ea4cfb4b06e27d1e\n" }, { "commit": "456acaae9592985f6424cd244c55de9982537f42", "tree": "85210906ddff1c3fa94a5eff574cfc702c687a05", "parents": [ "4f8ed8d9895f0be76467e7052ef02f7f61e6bcda" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Jun 15 14:19:37 2022 -0700" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Thu Jun 16 15:49:20 2022 -0700" }, "message": "Check whether pointer has stopped at liftoff\n\nAndroid uses ACTION_UP and ACTION_POINTER_UP events to signal that a\npointer has left the screen.\n\nThese events don\u0027t carry new information, and should always have the\nsame coordinates as the last ACTION_MOVE event.\nHowever, these events do have a new timestamp.\n\nBefore this CL: these events are getting ignored completely by\nVelocityTracker. If there\u0027s a large delay before ACTION_UP, the velocity\nis still reported to be the same as the if there\u0027s no delay.\n\nIn this CL: we will check these events for timestamps. If too much time\nhas passed, we will clear the strategy.\n\nExample logs:\nVelocityTracker: VelocityTracker: stopped for 2970.0 ms, clearing state upon pointer liftoff.\n\nBug: 200900433\nTest: atest libinput_tests\nChange-Id: Ie3e5a61e70b6324ee4aedaf2bce58766f5598718\n" }, { "commit": "37ce3ecd9268adead6d04ae8211443eaded20ae5", "tree": "d2c99507325635237d4358201944e16126edb497", "parents": [ "715b4413b93d90c9d2a1f559c9b0fac69dd09f4f" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Thu Jun 16 22:06:21 2022 +0000" }, "committer": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Thu Jun 16 22:47:44 2022 +0000" }, "message": "SurfaceFlinger: Remove BufferQueueLayer\n\nFixes: 200285148\nTest: builds\n\nChange-Id: I218bfb8110b5aef7a292e805e8508a278b07b684\n" }, { "commit": "715b4413b93d90c9d2a1f559c9b0fac69dd09f4f", "tree": "a45b301ccc8d499714d73b479a46b4d6ac0426e7", "parents": [ "2a0286c70f7ac924c6b55e1eade29f25845a3347", "f8a873a9172df74b4b985a678b22b328acb08d37" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Thu Jun 16 20:20:04 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 16 20:20:04 2022 +0000" }, "message": "Merge \"SF: Remove BufferQueueLayer tests\"" }, { "commit": "53182e4f36b7ea755bfb90efcbd1836832478a02", "tree": "5901f8e5b7d73eb90f60ba6af9bbd88b89ec2257", "parents": [ "a9dbc49ee3d32a677494d93e1dca510c4ca9455b", "099a4648fdf4f261f70ca63920d24ba963d652f8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 16 19:58:26 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 19:58:26 2022 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12 QPR 3\" am: 099a4648fd -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: Ie4094e2d398d5d568b1064fd199e65cfdbad3aab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a9dbc49ee3d32a677494d93e1dca510c4ca9455b", "tree": "5901f8e5b7d73eb90f60ba6af9bbd88b89ec2257", "parents": [ "01531617fd713482ae3094c7ae295c81c4c0de7b", "97aaa7fa51f10d675a7805089b7810c7836ec4ab" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 16 19:57:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 19:57:08 2022 +0000" }, "message": "[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa51 -s ours\n\nam skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138\n\nChange-Id: I4a8e6ee020024f0edeb030aaa77acf2a644bb349\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "099a4648fdf4f261f70ca63920d24ba963d652f8", "tree": "5901f8e5b7d73eb90f60ba6af9bbd88b89ec2257", "parents": [ "2fd11cca9c4eef0d71647e882835b2ee42a63b7b", "97aaa7fa51f10d675a7805089b7810c7836ec4ab" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 16 18:51:55 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 16 18:51:55 2022 +0000" }, "message": "Merge \"Merge Android 12 QPR 3\"" }, { "commit": "2a0286c70f7ac924c6b55e1eade29f25845a3347", "tree": "a7ed42c8ba80884ceea720804afa9c9cd0f750ca", "parents": [ "4f8ed8d9895f0be76467e7052ef02f7f61e6bcda", "0d837ac2def4842436fb7a64d96c8ebe11b42638" ], "author": { "name": "Matt Buckley", "email": "mattbuckley@google.com", "time": "Thu Jun 16 17:58:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 17:58:38 2022 +0000" }, "message": "Merge \"Rename hwc-specific methods and properties for readability\" into tm-qpr-dev am: d1424deade am: 0d837ac2de\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18783764\n\nChange-Id: I2049c6a96a03ccc0fb4578d020bca5996bd47a9d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d945d3e55ecd98d6554a9fdf6dfa1beb1c64a189", "tree": "3495973415e51d81fd3113af36d89533fbcce665", "parents": [ "3dee0df77f44dd85b0f03b14db7966e1ba8faeb3" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed May 18 09:42:52 2022 -0700" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Thu Jun 16 17:35:36 2022 +0000" }, "message": "Do not load keylayout if required kernel module is missing\n\nSome key layouts require the presence of a specific kernel module. If\nthe kernel module is not present, the layout should not be loaded.\n\nIn this CL, we add an option to specify which kernel modules / configs\nare needed inside the kl file.\n\nBug: 228005926\nTest: atest libinput_tests\nChange-Id: I0d2ab6298bd41df6dc56120bf0385e10da6c3bfe\nMerged-In: I0d2ab6298bd41df6dc56120bf0385e10da6c3bfe\n" }, { "commit": "0d837ac2def4842436fb7a64d96c8ebe11b42638", "tree": "8ee480b8580e75a1e4a03058a31648e91a8775b9", "parents": [ "99d8f50eb840765124a6306a0df1d4d5000b1712", "d1424deadeb8ed323cde5eed698e98e71821efc3" ], "author": { "name": "Matt Buckley", "email": "mattbuckley@google.com", "time": "Thu Jun 16 17:29:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 17:29:56 2022 +0000" }, "message": "Merge \"Rename hwc-specific methods and properties for readability\" into tm-qpr-dev am: d1424deade\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18783764\n\nChange-Id: Ie1fe21c3be19e77b93a916393a6a71086367610f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d1424deadeb8ed323cde5eed698e98e71821efc3", "tree": "799fca5e24f346526b487c81c701a9d51215258b", "parents": [ "94c8445514c4a9ab71b31000a853dc42fe4735fc", "16dec1f6fb5fff413a0bfe008969ed84a7101528" ], "author": { "name": "Matt Buckley", "email": "mattbuckley@google.com", "time": "Thu Jun 16 17:05:46 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 16 17:05:46 2022 +0000" }, "message": "Merge \"Rename hwc-specific methods and properties for readability\" into tm-qpr-dev" }, { "commit": "4f8ed8d9895f0be76467e7052ef02f7f61e6bcda", "tree": "2de901270500a6742cd639ae652be69240918fb5", "parents": [ "858b5486a1521a333c6db4640b339c30b5cb0a9f", "99d8f50eb840765124a6306a0df1d4d5000b1712" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 02:02:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 02:02:42 2022 +0000" }, "message": "[automerger skipped] Merge \"Avoid using KeyedVector in KeyLayoutMap\" am: 2fd11cca9c am: 01531617fd -s ours am: 3dee0df77f -s ours am: a365de7ae7 -s ours am: 99d8f50eb8 -s ours\n\nam skip reason: Merged-In Ia1f41d17d7ee912534edffe1a1e7655866fa54c6 with SHA-1 53f0a5e01c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126146\n\nChange-Id: I06550a10556feb59d137543cdf685d052801920c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "858b5486a1521a333c6db4640b339c30b5cb0a9f", "tree": "2de901270500a6742cd639ae652be69240918fb5", "parents": [ "07ffd7399b012fb48d5fcc012032d24f9da28eab", "bc4c5d7d5bde755718bc352cffc1d9a151461934" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 02:02:19 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 02:02:19 2022 +0000" }, "message": "Merge \"Do not set bugprone-branch-clone as error.\" am: 265530ed85 am: c28886628c am: 1b17342331 am: f0f609da48 am: bc4c5d7d5b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2122472\n\nChange-Id: Ie8f02204878249b2b9f75e23054ca934ea46fd8b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "99d8f50eb840765124a6306a0df1d4d5000b1712", "tree": "fd28cc0f90cb4aa642a67054d5105c3a663b236e", "parents": [ "bc4c5d7d5bde755718bc352cffc1d9a151461934", "a365de7ae77c675414880ec50b2ec2b644b19c63" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 01:43:39 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 01:43:39 2022 +0000" }, "message": "[automerger skipped] Merge \"Avoid using KeyedVector in KeyLayoutMap\" am: 2fd11cca9c am: 01531617fd -s ours am: 3dee0df77f -s ours am: a365de7ae7 -s ours\n\nam skip reason: Merged-In Ia1f41d17d7ee912534edffe1a1e7655866fa54c6 with SHA-1 53f0a5e01c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126146\n\nChange-Id: I0ecb92ca1346a7f979a945577841b4f9540658df\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bc4c5d7d5bde755718bc352cffc1d9a151461934", "tree": "fd28cc0f90cb4aa642a67054d5105c3a663b236e", "parents": [ "46c40bc392e20989dc0e6d5d1664c795f9432091", "f0f609da48f0ce1fa3e1919264159bd5449fda67" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 01:42:52 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 01:42:52 2022 +0000" }, "message": "Merge \"Do not set bugprone-branch-clone as error.\" am: 265530ed85 am: c28886628c am: 1b17342331 am: f0f609da48\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2122472\n\nChange-Id: I3475d238f968531b4f47948815fac8a6f5709ac6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a365de7ae77c675414880ec50b2ec2b644b19c63", "tree": "1d60520f54ac6e44e7a9839244e3edc428f9970a", "parents": [ "f0f609da48f0ce1fa3e1919264159bd5449fda67", "3dee0df77f44dd85b0f03b14db7966e1ba8faeb3" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 01:19:49 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 01:19:49 2022 +0000" }, "message": "[automerger skipped] Merge \"Avoid using KeyedVector in KeyLayoutMap\" am: 2fd11cca9c am: 01531617fd -s ours am: 3dee0df77f -s ours\n\nam skip reason: Merged-In Ia1f41d17d7ee912534edffe1a1e7655866fa54c6 with SHA-1 53f0a5e01c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126146\n\nChange-Id: I505d40a84a5e3fedb6f7dada758a6678372b52ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f0f609da48f0ce1fa3e1919264159bd5449fda67", "tree": "1d60520f54ac6e44e7a9839244e3edc428f9970a", "parents": [ "2a6007a65299bdbd9cfce9b5e52f9ef3b7175c5a", "1b17342331400e8ebeb17bca0fa12cb2626e810a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 01:19:07 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 01:19:07 2022 +0000" }, "message": "Merge \"Do not set bugprone-branch-clone as error.\" am: 265530ed85 am: c28886628c am: 1b17342331\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2122472\n\nChange-Id: I64fab245b5892ffd9215f1c9af4402d439a1e476\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3dee0df77f44dd85b0f03b14db7966e1ba8faeb3", "tree": "1d60520f54ac6e44e7a9839244e3edc428f9970a", "parents": [ "1b17342331400e8ebeb17bca0fa12cb2626e810a", "01531617fd713482ae3094c7ae295c81c4c0de7b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 00:44:35 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 00:44:35 2022 +0000" }, "message": "[automerger skipped] Merge \"Avoid using KeyedVector in KeyLayoutMap\" am: 2fd11cca9c am: 01531617fd -s ours\n\nam skip reason: Merged-In Ia1f41d17d7ee912534edffe1a1e7655866fa54c6 with SHA-1 53f0a5e01c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126146\n\nChange-Id: Id463aec9f91f96c379655c87fa6b889860d643e8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1b17342331400e8ebeb17bca0fa12cb2626e810a", "tree": "1d60520f54ac6e44e7a9839244e3edc428f9970a", "parents": [ "6e26f518dcc8a66521edcaeeac0670f23035c823", "c28886628c457645f878d3e1fcc3184b4ff3934c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 00:43:23 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 00:43:23 2022 +0000" }, "message": "Merge \"Do not set bugprone-branch-clone as error.\" am: 265530ed85 am: c28886628c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2122472\n\nChange-Id: Icbe91acd99e105feb4b408b1498f1b9ea81191d9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "07ffd7399b012fb48d5fcc012032d24f9da28eab", "tree": "2fdfa47a7d122669e043e73d8cdfdfaa41db3601", "parents": [ "b985b56512ffabcce8c803648fdb32d2586d8f47", "46c40bc392e20989dc0e6d5d1664c795f9432091" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 00:31:34 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 00:31:34 2022 +0000" }, "message": "[automerger skipped] Merge \"Refactor input code for require_kernel_config parameter\" am: 66c1eb6829 am: 7956dd0844 -s ours am: 6e26f518dc -s ours am: 2a6007a652 -s ours am: 46c40bc392 -s ours\n\nam skip reason: Merged-In Iab06bb6ef44807308ee2b3e6b8a0c780bb748f09 with SHA-1 ac7f2e7be3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126145\n\nChange-Id: I1f2c88c9b10d4bb51637bf430818fabf70e05248\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "01531617fd713482ae3094c7ae295c81c4c0de7b", "tree": "5901f8e5b7d73eb90f60ba6af9bbd88b89ec2257", "parents": [ "c28886628c457645f878d3e1fcc3184b4ff3934c", "2fd11cca9c4eef0d71647e882835b2ee42a63b7b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 00:09:14 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 00:09:14 2022 +0000" }, "message": "Merge \"Avoid using KeyedVector in KeyLayoutMap\" am: 2fd11cca9c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126146\n\nChange-Id: Ida5c89bd94417b849331c53d5040b8d7b2e75212\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c28886628c457645f878d3e1fcc3184b4ff3934c", "tree": "eae73a9b34b98ee751ca016abd012e26138a349a", "parents": [ "7956dd08445a65eb1b22612cd9274a5d8018ca9d", "265530ed85e5475802b6bbb5dd2150dd4200ec26" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 16 00:07:04 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 00:07:04 2022 +0000" }, "message": "Merge \"Do not set bugprone-branch-clone as error.\" am: 265530ed85\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2122472\n\nChange-Id: Id382e6a6274970861e4811d3b73f229d83d2f893\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2fd11cca9c4eef0d71647e882835b2ee42a63b7b", "tree": "6d4cad1b25afceced2d475c708fbd2abfaa8c74c", "parents": [ "265530ed85e5475802b6bbb5dd2150dd4200ec26", "984f40b9cdd9e19554eb662378bf74a77c4651ff" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 15 23:01:00 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 15 23:01:00 2022 +0000" }, "message": "Merge \"Avoid using KeyedVector in KeyLayoutMap\"" }, { "commit": "265530ed85e5475802b6bbb5dd2150dd4200ec26", "tree": "3908294e151f37964c533d621ef8356d5f3de241", "parents": [ "66c1eb682959a08bc36b869a6d27e45b1abb83fd", "41366b47b21782e9c3b5b023418bdb3e51ead3a3" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 15 22:55:06 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 15 22:55:06 2022 +0000" }, "message": "Merge \"Do not set bugprone-branch-clone as error.\"" }, { "commit": "46c40bc392e20989dc0e6d5d1664c795f9432091", "tree": "b34f08c13513974344d73a607dd7ed08829fef37", "parents": [ "0755104548a5b6fe19d3b3061145176cbb4aa77c", "2a6007a65299bdbd9cfce9b5e52f9ef3b7175c5a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 15 22:36:47 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 15 22:36:47 2022 +0000" }, "message": "[automerger skipped] Merge \"Refactor input code for require_kernel_config parameter\" am: 66c1eb6829 am: 7956dd0844 -s ours am: 6e26f518dc -s ours am: 2a6007a652 -s ours\n\nam skip reason: Merged-In Iab06bb6ef44807308ee2b3e6b8a0c780bb748f09 with SHA-1 ac7f2e7be3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126145\n\nChange-Id: Ib59492109f85e36461968aee32dfb032441b5d02\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2a6007a65299bdbd9cfce9b5e52f9ef3b7175c5a", "tree": "ba9d921ce56e210fc61e72c7038a1ffdbc13f9ed", "parents": [ "9a641cd3785ab0d205e0b0ba8d0acda8d0375f22", "6e26f518dcc8a66521edcaeeac0670f23035c823" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 15 21:50:44 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 15 21:50:44 2022 +0000" }, "message": "[automerger skipped] Merge \"Refactor input code for require_kernel_config parameter\" am: 66c1eb6829 am: 7956dd0844 -s ours am: 6e26f518dc -s ours\n\nam skip reason: Merged-In Iab06bb6ef44807308ee2b3e6b8a0c780bb748f09 with SHA-1 ac7f2e7be3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126145\n\nChange-Id: I60edcde89e7fd5f1e2f47d75f1a0cd670f68f193\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8a873a9172df74b4b985a678b22b328acb08d37", "tree": "287320f1af3b10f56efb74397b1c2c0331bd7f13", "parents": [ "17be5263a5a9c2abc5003678949b93b33d82db48" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Wed Jun 15 17:34:34 2022 +0000" }, "committer": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Wed Jun 15 21:15:38 2022 +0000" }, "message": "SF: Remove BufferQueueLayer tests\n\nReplace BQL with BSL inside composition\nengine tests. While we are at it make BQL\nconstructor private and build the world.\n\nBug: 200285148\nTest: atest libsurfaceflinger_tests\nChange-Id: I28d1c5ff73074c8c7a27ca45ce4c2ca2cc2e385f\n" }, { "commit": "6e26f518dcc8a66521edcaeeac0670f23035c823", "tree": "ba9d921ce56e210fc61e72c7038a1ffdbc13f9ed", "parents": [ "aa2c8111311936074c8e150f9863e9fb9e7f0f4a", "7956dd08445a65eb1b22612cd9274a5d8018ca9d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 15 21:10:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 15 21:10:02 2022 +0000" }, "message": "[automerger skipped] Merge \"Refactor input code for require_kernel_config parameter\" am: 66c1eb6829 am: 7956dd0844 -s ours\n\nam skip reason: Merged-In Iab06bb6ef44807308ee2b3e6b8a0c780bb748f09 with SHA-1 ac7f2e7be3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126145\n\nChange-Id: I8f3fce93ed63561bc7e496a33666ea020bd5384a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "b985b56512ffabcce8c803648fdb32d2586d8f47" }