)]}' { "log": [ { "commit": "15e70c81983a0595dfba9ae650d1b06736c486fb", "tree": "ca2c4713e2ccd5e4efda82db8c9993ae3fbadf57", "parents": [ "a98bb79a65615ef7d43bea4d67b1b33800c14bd9", "ae6753571e418e012a84ee5f4a955a09fd1de8dc" ], "author": { "name": "Paul Lawrence", "email": "paullawrence@google.com", "time": "Mon Mar 04 15:51:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 04 15:51:27 2024 +0000" }, "message": "Merge \"Prevent error message on svc power reboot\" into main am: ae6753571e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2983091\n\nChange-Id: I4a4cee32e1b3bd96addcd3b2fc82708f24484f44\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "86b8d5e51a81e370f84a7f61764f4348edd394f7", "tree": "7e86581d145a1c9d4f7c4d491bdd53b844d2239c", "parents": [ "3bd28b5829f1d463b31550ebc500ec0d8874b68d" ], "author": { "name": "Paul Lawrence", "email": "paullawrence@google.com", "time": "Wed Feb 28 20:10:39 2024 +0000" }, "committer": { "name": "Paul Lawrence", "email": "paullawrence@google.com", "time": "Wed Feb 28 23:20:42 2024 +0000" }, "message": "Prevent error message on svc power reboot\n\nWith the changes to sys.powerctl this variable is no longer set on a\npower event - the power action is simply carried out. (This is to avoid\npossible DoS of these power functions.) However, this means that this\nproperty can no longer be read to see if a power event is happening.\nSince there is no longer a way of telling if a remote exception is real\nor not, best not to print out an error.\n\nNote that this bug occurs on some devices, not all. I was able to\nreproduce it reliably on a Pixel 7a, but not on a Pixel 7 or Cuttlefish.\n\nBug: 318323013\nTest: adb shell svc power reboot\n\nChange-Id: Icbc1ec1b7882140d4d742b056ea2adaafae67ee9\n" }, { "commit": "7b647e4ea0e92f33c19b315eaed364ee067ba0aa", "tree": "47c285aa18cf79476d615f8e169ebd823bee6d38", "parents": [ "46deec9f696f850efdd4427e10db145d68cbb5bd", "efd99108901ae47b085f96c841214f6f416dd86f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 30 10:36:03 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 30 10:36:03 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: I46c7859ff042ee7aa9193757e5df8269f4892362\nChange-Id: I0c7b5036c0b0f5f2caad551edb063350f6eb87e7\n" }, { "commit": "a7e10edaa3c165bda6a58bc3ed3fb042274d5578", "tree": "47bdd4f3cb097dd90d53a96618e13768c57da4b7", "parents": [ "123ba0f593459dfb5b01596862b3278c1140a6e2", "a76df8904aeef1f42f3a714797bc3de1bd9e76c5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 15 18:22:30 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 15 18:22:30 2023 +0000" }, "message": "Merge \"bootanimtion: fix jagged animation after resolution change\" into main" }, { "commit": "deb46f31bf04f17e8a636ec2eead8f75268f64ec", "tree": "b9aa91d5b4d1cd9558e8154cbe96009ee4cc74bb", "parents": [ "87f82bb9ba06450ebba5b65261dc707761dea54a" ], "author": { "name": "Jeremy Meyer", "email": "jakmcbane@google.com", "time": "Wed Nov 08 12:20:24 2023 -0800" }, "committer": { "name": "Jeremy Meyer", "email": "jakmcbane@google.com", "time": "Tue Dec 05 13:12:53 2023 -0800" }, "message": "Handle 9patches being used for frros\n\nThis adds an api that allows creation of nine patch frros.\nWe process them the same as aapt2 does so that\nwhen they are used at runtime they work correctly.\n\nAPI-Coverage-Bug: 314168567\nTest: manual and automatic\nBug: 296324826\nChange-Id: I40da020189e9ec914fbea0c17f181209347d83de\n" }, { "commit": "69f1c8e575f700ca8db2c503023fed4b43d5248b", "tree": "8828037bc44f96ba78cc914f11f8558663243d0b", "parents": [ "9c3cac223c17bc7999c52ba35b6c4b5e7544de75", "d9505841eda9829354cb2b81afea2138d5555a10" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Thu Nov 23 11:05:41 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 23 11:05:41 2023 +0000" }, "message": "Merge changes Idd3b6166,Iad0e7888 into main\n\n* changes:\n uinput: set device version IDs from evemu files\n uinput: report evemu parsing errors\n" }, { "commit": "7b8bd6675ae43dda8e6877ef41b3b31e3975bd6c", "tree": "a932c21b7f1a74deccc39242aa4fed8120cd271c", "parents": [ "e306e0069a801a82a490ea39775b526fa0f638c1", "9cf990e2f22500afdaa31a1450cd32f71638a4f8" ], "author": { "name": "YoungJoon Yang", "email": "youngjoonyang@google.com", "time": "Thu Nov 23 01:21:34 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 23 01:21:34 2023 +0000" }, "message": "Merge \"Set default rotation and boot animation orientation for logical display\" into main" }, { "commit": "d9505841eda9829354cb2b81afea2138d5555a10", "tree": "ff68492ab3f7eb1d0a8e9c3d4aa65400a0843101", "parents": [ "45094325b42698061916850138e457b00a3f7954" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Wed Nov 22 15:32:07 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Wed Nov 22 16:21:33 2023 +0000" }, "message": "uinput: set device version IDs from evemu files\n\nBug: 302297266\nTest: atest UinputTests\nTest: play a recording with version ID set, check `getevent -li` output\n while it\u0027s running\nChange-Id: Idd3b6166a3912c26720dddbf4ad72b5a07a604a5\n" }, { "commit": "45094325b42698061916850138e457b00a3f7954", "tree": "c5443144d2f2f6c81cb07d27c691a857a16c8d68", "parents": [ "b359805226a624ba5320492f4048799d78d2f92d" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 21 16:39:31 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Wed Nov 22 15:33:32 2023 +0000" }, "message": "uinput: report evemu parsing errors\n\nBug: 302297266\nTest: run with various broken recordings, check error messages are\n helpful and have correct line numbers\nChange-Id: Iad0e788815c9d146babe67568a6ceef27b68007f\n" }, { "commit": "b359805226a624ba5320492f4048799d78d2f92d", "tree": "141d3f47c5eb1fce6962cdc1058a3585e3ddf056", "parents": [ "21dedc406b5e784e187ff979a984e8623a8493a5" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Wed Nov 15 16:19:05 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Wed Nov 22 15:33:20 2023 +0000" }, "message": "uinput: add unit tests for evemu parsing\n\nBug: 302297266\nTest: atest UinputTests\nChange-Id: I7b4c6fa87f6ba50147f3ddeb9b8e4ceaa238ffc1\n" }, { "commit": "792e58171f79aa773c8e0bf7cbef85e48a3ea492", "tree": "9347ff127c1de4584da8f4ecc2591fea773ef3b7", "parents": [ "7fa0fdedcdcc0feeec6602d25d40f8d65cef0c53", "4ec6969f9cd7998a33301b3b7f99c05e25cf3a2f" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Wed Nov 22 12:17:40 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 22 12:17:40 2023 +0000" }, "message": "Merge \"uinput: support evemu recordings\" into main" }, { "commit": "4ec6969f9cd7998a33301b3b7f99c05e25cf3a2f", "tree": "31c35e5fb66b407ddde44d75bec584e3388d83b4", "parents": [ "766ff01ffc0ff3356156fa3fb27612676de581a3" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 14:31:03 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 21 18:30:19 2023 +0000" }, "message": "uinput: support evemu recordings\n\nevemu [0] is a system used by the wider Linux community to record\nsequences of evdev events and descriptions of the device that created\nthem. Together with the evemu-record implementation added to\nframeworks/native, implementing support for evemu recordings in uinput\ngives us a system for event recording and replay that\u0027s compatible with\nother Linux systems.\n\nSince the format looks quite different from the existing JSON-style one,\nwe can automatically detect which type of data is being passed in,\ninstead of having to change the command-line interface.\n\nAs part of the implementation, the Event.Bus enum is replaced with plain\nintegers. This allows the tool to support new bus IDs that are added to\nLinux\u0027s input.h without code changes, at least for evemu files.\n\n[0]: https://gitlab.freedesktop.org/libevdev/evemu\n\nBug: 302297266\nTest: replay recordings made using Android and FreeDesktop\n evemu-record implementations\nChange-Id: Ie2f969da24db9aa04037335d5b697cdc0db0b3ca\n" }, { "commit": "342e37d2d13b616c26e8cacb0270687e046c7ef5", "tree": "bb29277d7c371cac4f3016e41e28d88ce23839f1", "parents": [ "d908e5f299cac032b39d55519fb27236feaefa65" ], "author": { "name": "Pascal Muetschard", "email": "pmuetschard@google.com", "time": "Wed Nov 08 16:05:15 2023 +0100" }, "committer": { "name": "Pascal Mütschard", "email": "pmuetschard@google.com", "time": "Tue Nov 21 16:01:56 2023 +0000" }, "message": "Move counter producer off of vendor partition.\n\nAlthough the binary looks for a vendor provided shared library,\nit is an otherwise vendor agnostic tool. Moving it off the\nvendor partition also has the added benefit of it not requiring\nroot to be run.\n\nBug: b/273907878\nTest: manual\nChange-Id: I81726ffb7d96acef69b7b77c864be254be9a74c5\n" }, { "commit": "43a117cbe0271996b08134b3796e7237c5eca8c3", "tree": "045f73af6c981f35ce135a532f0f86afca2afa73", "parents": [ "fff1a90416497cb8a3cc5ab9e8bb956c71ae24f6", "e28db5f173d12eea51ee72242a656fb1b08aa285" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Fri Nov 17 18:13:00 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 17 18:13:00 2023 +0000" }, "message": "Merge \"uinput: crash if device creation fails\" into main" }, { "commit": "fcbb655570ee96ba09f76a859566f908e8b939f6", "tree": "a9bda77d3e6894ef55ca47ab8462cc5272496b31", "parents": [ "a481cc281bd75b939d5b184219fa1f651c9f7a01", "766ff01ffc0ff3356156fa3fb27612676de581a3" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Fri Nov 17 12:44:18 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 17 12:44:18 2023 +0000" }, "message": "Merge \"uinput: pass Commands to Event.Builder.setCommand\" into main" }, { "commit": "766ff01ffc0ff3356156fa3fb27612676de581a3", "tree": "24ab0e94ec00a80e8024cc871eb6b54b966c786e", "parents": [ "70bb706e1c70ed45aebef5d0e8288399e3eca9b3" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 16:56:14 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Thu Nov 16 15:27:55 2023 +0000" }, "message": "uinput: pass Commands to Event.Builder.setCommand\n\nParsing strings into enum values should be done by the parser, not the\nbuilder, and this means that the evemu parser will be able to pass\nproperly typed values to setCommand rather than \"magic\" strings.\n\nBug: 302297266\nTest: m uinput\nChange-Id: Icac5764a66025412c87c326280d1895f3da78cac\n" }, { "commit": "e28db5f173d12eea51ee72242a656fb1b08aa285", "tree": "30b817c23e4aa8ecb3a83ee1dc393e5afc6256fe", "parents": [ "70bb706e1c70ed45aebef5d0e8288399e3eca9b3" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 15:54:21 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Thu Nov 16 15:25:34 2023 +0000" }, "message": "uinput: crash if device creation fails\n\nPreviously the tool just carried on, with event injections being\nsilently dropped, which isn\u0027t very obvious behaviour.\n\nBug: 302297266\nTest: cause device creation to fail somehow, check the tool exits\nChange-Id: I94e931729339bff0f6fc7ab5b591f062043a1d7a\n" }, { "commit": "2bec9191eb0788b85ec347b0ad75ef8037b81f82", "tree": "3826ecd5a6435ced022546429f488f9b273d57f0", "parents": [ "70bb706e1c70ed45aebef5d0e8288399e3eca9b3" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 14:55:04 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Thu Nov 16 15:23:02 2023 +0000" }, "message": "uinput: report errors from configuration ioctls\n\nThis came in useful when debugging the evemu support, and seems like\nsomething we should be checking anyway.\n\nBug: 302297266\nTest: pass some invalid arguments (e.g. large numbers that aren\u0027t valid\n event codes) to the ioctls, check errors are logged\nChange-Id: Id3e32dad96c9db8819009b815ee2574ef63e96f7\n" }, { "commit": "563c9b3c730d245af5c1c24a017d65bd16f15bb7", "tree": "f23a27f0036fec70f91675d84462da53b5cbb74d", "parents": [ "da15623a25ef4aedc7ce3a2271157af2a25b68a7", "4de6e7437fe03709e900ab7dba38f761489ccce6" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Nov 16 00:03:29 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 16 00:03:29 2023 +0000" }, "message": "Merge \"Add CaptureArgs \u0026 long options to screencap\" into main" }, { "commit": "4de6e7437fe03709e900ab7dba38f761489ccce6", "tree": "dc0d71cd7628b890787d815d962e2d213c7e2b89", "parents": [ "c64add5fbce5a1211b77d0cc7cc2e3969f402f03" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 14 18:32:32 2023 -0500" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 14 20:54:24 2023 -0500" }, "message": "Add CaptureArgs \u0026 long options to screencap\n\nTest: make \u0026\u0026 adb shell screencap\nChange-Id: I0141a9ea9b51a06bafdeac6c7848986906b8eacc\n" }, { "commit": "ffa80d0a853111efb9521a551a9496385aa5a9c6", "tree": "bd22724d0f98fbd1c931a174233fc97298d2beea", "parents": [ "5cfe5d02a59a0c6ecd0b906a346b77c3dbf0a114", "822e9c80deba25a93846ab539622322613eaab0b" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 14:56:07 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 14:56:07 2023 +0000" }, "message": "Merge changes I9b9ae897,Iad98088b,Id6c7536a into main\n\n* changes:\n uinput: improve Event.Builder API\n uinput: use enum valueOf method\n uinput: move Event.Reader to its own file\n" }, { "commit": "822e9c80deba25a93846ab539622322613eaab0b", "tree": "2448800487e0cabab5b7391576cc9a105cf75cca", "parents": [ "55a237588d0608ec459d4a4df832b8130043cbce" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Mon Nov 13 18:30:59 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 10:33:33 2023 +0000" }, "message": "uinput: improve Event.Builder API\n\nRename setDuration and associated identifiers to make the units clearer,\nfix a typo in setInputport, and add some JavaDoc to clarify the\nstructure of configuration arrays.\n\nBug: 302297266\nTest: m uinput\nChange-Id: I9b9ae8970389da3cdfe06738883ef02ebf07ff77\n" }, { "commit": "55a237588d0608ec459d4a4df832b8130043cbce", "tree": "e3deda2599172aaf93ac0e619accc9d3bce7786a", "parents": [ "37e7df398ea3a9bf6b58eb23fac678b90b808971" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Mon Nov 13 17:47:20 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 10:33:30 2023 +0000" }, "message": "uinput: use enum valueOf method\n\nThis makes the Command and UinputControlCode enums and the code to look\nup their values a little tidier.\n\nBug: 302297266\nTest: atest CtsInputHostTestCases\nChange-Id: Iad98088b93dc1e1b72df1efbeb9010f78c6962e9\n" }, { "commit": "37e7df398ea3a9bf6b58eb23fac678b90b808971", "tree": "5d0e64c7f349a9159b7ee19c48531afca8dd9770", "parents": [ "813da4623d2c6d80d3e23767973bf9d8284f7543" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Wed Nov 08 11:02:33 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Tue Nov 14 10:31:52 2023 +0000" }, "message": "uinput: move Event.Reader to its own file\n\nWe\u0027ll shortly be adding a parser for a different file format (evemu),\nand having the different parsers in separate files will make the code\nnicer to navigate.\n\nIn addition to moving it to a separate file, this CL renames Reader to\nJsonStyleParser to avoid confusion with Java\u0027s Reader classes, and\nreplaces some switch statements with the new-style switch syntax to\nimprove readability.\n\nBug: 302297266\nTest: atest CtsInputHostTestCases\nChange-Id: Id6c7536a2caea3b61fac615dce071129bf4dc1e4\n" }, { "commit": "9cf990e2f22500afdaa31a1450cd32f71638a4f8", "tree": "de8dde937e02439f1cf87492cc1e1c5a340ecf94", "parents": [ "0bc6b1e81239aa3c99d8351c81ad5517023e1fad" ], "author": { "name": "YoungJoon Yang", "email": "youngjoonyang@google.com", "time": "Mon Nov 13 15:34:28 2023 +0900" }, "committer": { "name": "YoungJoon Yang", "email": "youngjoonyang@google.com", "time": "Mon Nov 13 16:02:07 2023 +0900" }, "message": "Set default rotation and boot animation orientation for logical display\n\nIntroduce ro.bootanim.set_orientation_logical_\u003cdisplay_id\u003e allows to\nchange the default orientation of logical display.\n\nBug: 272527451\nTest: Manual test with all 4 values\nChange-Id: I39a0d5df97d5185090b6a793e52ecaa5f3bc0baa\n" }, { "commit": "40f54db094ab39b318c786d16b1f1f5b56ac8ebd", "tree": "8ebe6818fceaa1c573dd1b44a06db5e4c0d9c1a2", "parents": [ "6acd07f545afd557ff90410b0c10a3b67f40c3ca", "d8dc5b3f8af19d4f628843a89e158167b02f7c9d" ], "author": { "name": "Dominik Laskowski", "email": "domlaskowski@google.com", "time": "Thu Nov 09 16:00:05 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 09 16:00:05 2023 +0000" }, "message": "Merge \"screencap: Fix parsing of display IDs\" into main" }, { "commit": "d8dc5b3f8af19d4f628843a89e158167b02f7c9d", "tree": "6ec9a6f593f168cddb18f956df34d3d495ef927b", "parents": [ "fa76ad2f83b019184fe2f57b2ef6be1d44a80adc" ], "author": { "name": "Dominik Laskowski", "email": "domlaskowski@google.com", "time": "Thu Sep 28 17:10:47 2023 -0400" }, "committer": { "name": "Dominik Laskowski", "email": "domlaskowski@google.com", "time": "Wed Nov 08 17:07:31 2023 -0500" }, "message": "screencap: Fix parsing of display IDs\n\nThe underlying type of DisplayId is uint64_t, but screencap parsed the\nIDs as signed 64-bit, invoking undefined behavior for out-of-range IDs.\nIn practice, out-of-range IDs were clamped, so SF failed to find them.\n\nFixes: 302580952\nTest: screencap works for virtual display on Felix\nChange-Id: I09a863d0c68dbb857b6f756b51159e5e3d853f5d\n" }, { "commit": "1d801f52ec02f0ddd174e6ab72511de0de248074", "tree": "6d9fc3065a9ad407df5b30da8d458d4e58ef3e13", "parents": [ "22daeee1fae2d38179af79299c54c85e86f8dbae" ], "author": { "name": "Pascal Muetschard", "email": "pmuetschard@google.com", "time": "Wed Nov 08 11:07:23 2023 +0100" }, "committer": { "name": "Pascal Muetschard", "email": "pmuetschard@google.com", "time": "Wed Nov 08 11:09:38 2023 +0100" }, "message": "Ensure gpu_counter_producer can always find the driver\u0027s .so.\n\nTest: tested locally\nChange-Id: I4971e1b422bf4b278e8c3153e2134956c8d35700\n" }, { "commit": "27c5079cbf3207efc87eea9fe52708e48cad647e", "tree": "8fd1d24dcfe2931f02fd6b5cbcde1d112c81c49a", "parents": [ "72c6685cda6c64e89f3b8251e706364a119bb291", "036e9e145428f2eeac5b9781876e5d0462ba3d5b" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Tue Oct 24 14:59:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 14:59:22 2023 +0000" }, "message": "Merge \"Revert \"Revert \"svc(nfc): Use NfcAdapter API to enable/disable\"\"\" into main am: 1d98705039 am: eb66a4858c am: 036e9e1454\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799364\n\nChange-Id: Idd47b428034d0188a57290c32b6521b271c2248b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eb66a4858cd4a12a0833b5bf989ed99e900dafb7", "tree": "4776a3a6a3b989145a0c5bafcc2af36e5b354216", "parents": [ "f3dda786044cd4b2504afff8ccb6d23595e471e8", "1d98705039eb1344ba1eb4dbf945dcfe4942a05c" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Tue Oct 24 14:08:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 14:08:42 2023 +0000" }, "message": "Merge \"Revert \"Revert \"svc(nfc): Use NfcAdapter API to enable/disable\"\"\" into main am: 1d98705039\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799364\n\nChange-Id: I6bfa41e6cc5450578e6dd83954ba73bd4905dda2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dba2b42cbc1870eae764265e9dcc442c520f3af2", "tree": "200e125331ac2d20505208ab9d701690e881a303", "parents": [ "47be3bb627879495b8b6426a7f5b5680d9b1ee6b" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Tue Oct 24 00:58:58 2023 +0000" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 21:20:42 2023 -0700" }, "message": "Revert \"Revert \"svc(nfc): Use NfcAdapter API to enable/disable\"\"\n\nThis reverts commit 8140652ead483cad0f12c5f8fed1dec68e057f3e.\n\nReason for revert: Added a fix for the failing code.\n\nChange-Id: I729672340d52a745dd43121e1dbedf9d6d5ec34a\n" }, { "commit": "eaa6609500c243b98b7b3b428a6a2de00b2cfc31", "tree": "1dbba135936e9ff63177ee55af9c06af1e4185ca", "parents": [ "1a14e406edc4d681e3105b7812265cc9b542dc1b", "714286d19af06cefb6d3edc7d7516390bb33ff94" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 22:42:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 22:42:01 2023 +0000" }, "message": "Merge \"Revert \"svc(nfc): Use NfcAdapter API to enable/disable\"\" into main am: 47be3bb627 am: 8b0f90257a am: 714286d19a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799537\n\nChange-Id: I337d51bc8410046f2f84d834539825963c45e723\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b0f90257a088b3af9bc16219163a3ae51e5914f", "tree": "8237b14294459682ec57ef4b416a9cc041ec37f1", "parents": [ "90e7909fa66180d5692899a0ba1053aeac36ff9e", "47be3bb627879495b8b6426a7f5b5680d9b1ee6b" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 21:53:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 21:53:08 2023 +0000" }, "message": "Merge \"Revert \"svc(nfc): Use NfcAdapter API to enable/disable\"\" into main am: 47be3bb627\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799537\n\nChange-Id: I1ce54c3f0fff4ed9d6332643f80827802e44ebfe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "47be3bb627879495b8b6426a7f5b5680d9b1ee6b", "tree": "5dd1dcdcae893bf0e39e9a9bfe2b91f59de99687", "parents": [ "867815f0bea9f5497ef4695fb8bd5909e7ae6abd", "8140652ead483cad0f12c5f8fed1dec68e057f3e" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 21:29:43 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 23 21:29:43 2023 +0000" }, "message": "Merge \"Revert \"svc(nfc): Use NfcAdapter API to enable/disable\"\" into main" }, { "commit": "8140652ead483cad0f12c5f8fed1dec68e057f3e", "tree": "e2653888d8d504f1a210ce42f84ea360f87d359c", "parents": [ "12058cb9d93b62b7ac3e6c77ed5927c6db49dd03" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 21:27:55 2023 +0000" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 21:28:37 2023 +0000" }, "message": "Revert \"svc(nfc): Use NfcAdapter API to enable/disable\"\n\nThis reverts commit 12058cb9d93b62b7ac3e6c77ed5927c6db49dd03.\n\nReason for revert: Fails telephony tests\n\nBug: 303286040\nTest: N/A\nChange-Id: I07c79f6d07ac8f7394698b8144e9310be2f3f1fe\n" }, { "commit": "700151e91db4a63911b68b518791a7e7979f61dd", "tree": "02a207b21ce7f91ee48fc9ab60b31c48ac2f0162", "parents": [ "ac1fdf697efb7dca41b91e7f82acbbe195dcea1b", "a953edf9949d19820347d9776e2df507370db010" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 19:01:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 19:01:50 2023 +0000" }, "message": "Merge \"nfc: Add owners files\" into main am: 76d99d6277 am: 6ae2f3c177 am: a953edf994\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799357\n\nChange-Id: I253f4b501ef5c6b75599ff16caf9c305d6718d0c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ae2f3c177f0778a4a29ca117f8b565981f69fce", "tree": "420894ee2210d9746676e8ccb5eb4ef97b74f752", "parents": [ "ce2ef4ec48ddfb095369c070c58c80d5bf94fcbd", "76d99d627741b22d315f9f8a71e041f6f57e0de4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 18:31:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 18:31:31 2023 +0000" }, "message": "Merge \"nfc: Add owners files\" into main am: 76d99d6277\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799357\n\nChange-Id: Ide245db13a5aa1266dcb04f126f0600279a25983\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "edf7367aeaae4e233b6efeb401fbd614411eff72", "tree": "2ec2c57d9193348fcd8491c2a01d3941dec9c4c8", "parents": [ "ceba5139e62625a7fc5cb36da213bfde0ca87694" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 10:27:38 2023 -0700" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 10:30:00 2023 -0700" }, "message": "nfc: Add owners files\n\nFollow up CL for aosp/2798514 to add owners file.\n\nBug: 303286040\nTest: Compiles\nChange-Id: I18d8f617beb385c684c635ec2ec57d296be5e6f3\n" }, { "commit": "8a470ae155dbb3b57941c593feed895bf6873bc9", "tree": "648d103bf6a7dda8b7309c5237adcb00df7ac2ff", "parents": [ "85bd87469d2d83b53b4fdb91adb2db20e881d37b", "a06cea1c9d58a2052bd42909d930d0cd071a258d" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 15:11:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 15:11:32 2023 +0000" }, "message": "Merge \"svc(nfc): Use NfcAdapter API to enable/disable\" into main am: 6285b21624 am: a5112d4e33 am: a06cea1c9d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798234\n\nChange-Id: I2d5f7257deadeebed9a40e797195ace16d99319a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a5112d4e335bcbca4471b6381325a3d8e3a23153", "tree": "87d29266fd74ceb48400fe5e5e59a250706c3d02", "parents": [ "aa9d9647112da4e3d75b045ed1ca8256de2bd26f", "6285b216248d99cefbfd0d9493ff8c86a8eaca81" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 23 14:22:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 14:22:51 2023 +0000" }, "message": "Merge \"svc(nfc): Use NfcAdapter API to enable/disable\" into main am: 6285b21624\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798234\n\nChange-Id: Ic4ac3bad05cfe2ebd928783c6445c03dc2b7230c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "12058cb9d93b62b7ac3e6c77ed5927c6db49dd03", "tree": "cd3429302e3b941819ee21ace928b65bebd09518", "parents": [ "5ed8f129a5b6c0580ae3175b7e1e921b31f67f9f" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Oct 19 14:48:04 2023 -0700" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Oct 20 04:13:59 2023 +0000" }, "message": "svc(nfc): Use NfcAdapter API to enable/disable\n\nBug: 303286040\nTest: adb shell svc nfc enable\nChange-Id: I678d01c7c86defb7eb071d66cb2aede4983ab506\n" }, { "commit": "a76df8904aeef1f42f3a714797bc3de1bd9e76c5", "tree": "43613319b73e675d0c704251cabd47debfa923f6", "parents": [ "7e44fa6c44cace0006511dea23de7e63e711ba06" ], "author": { "name": "niuwenchao", "email": "niuwenchao@xiaomi.com", "time": "Mon Sep 11 17:19:04 2023 +0800" }, "committer": { "name": "wenchao niu", "email": "niuwenchao@xiaomi.com", "time": "Mon Oct 16 12:42:15 2023 +0000" }, "message": "bootanimtion: fix jagged animation after resolution change\n\njagged animation after resolution change, change Texture Filtering from GL_NEAREST to GL_LINEAR.\n\nChange-Id: I0788db4f4edb109eff3b86ce43be79eb206fe00b\nSigned-off-by: niuwenchao \u003cniuwenchao@xiaomi.com\u003e\n" }, { "commit": "2b9c6335d9a155ae7a9073808d3f70a113898209", "tree": "2b81556229c63dc55b59f1e551773fb34cb2d002", "parents": [ "595ecc5ec3444a81dd601cad3247eec0d22a94d5", "34178fa66a4a84ebc65bb6d54a800b8e0835b2d6" ], "author": { "name": "Yao Chen", "email": "yaochen@google.com", "time": "Fri Sep 29 18:39:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 29 18:39:13 2023 +0000" }, "message": "Merge \"Use readUniqueFileDescriptor in incidentd service\" into udc-qpr-dev am: 34178fa66a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24606762\n\nChange-Id: I0dad4f12d0f87a99af8fee11855ffba52e7edffa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "34178fa66a4a84ebc65bb6d54a800b8e0835b2d6", "tree": "d0032b35ee43fa5b17d4f340f3dc94c4c04365af", "parents": [ "7adeffd900374e6f98dccfd280d556153b5cf4cd", "eb695e1fe9baba71d1b460e1a8249190f3ade4f7" ], "author": { "name": "Yao Chen", "email": "yaochen@google.com", "time": "Fri Sep 29 18:09:07 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 29 18:09:07 2023 +0000" }, "message": "Merge \"Use readUniqueFileDescriptor in incidentd service\" into udc-qpr-dev" }, { "commit": "cd8d1801786ca9c29fa92777203fc40ffaacf244", "tree": "32e24f8333cb8c8e11a0d1ba2082267de091b5d2", "parents": [ "2263796ccf95e7a893b9f3e220b7dc2ae3fb24f1" ], "author": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Thu Sep 28 17:44:29 2023 +0000" }, "committer": { "name": "Harry Cutts", "email": "hcutts@google.com", "time": "Thu Sep 28 17:44:36 2023 +0000" }, "message": "uinput: document the port field for device registration\n\nBug: 245989146\nChange-Id: I84dfce5d216a5065611bf63f61e803a93e76b58f\nTest: check gittiles rendering\n" }, { "commit": "eb695e1fe9baba71d1b460e1a8249190f3ade4f7", "tree": "48dd96fd0fd3106d7b1cb23109dac82270912176", "parents": [ "6e837bea6b7f81a79f468283c68c1fc6f2e44855" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Tue Jun 13 17:37:26 2023 +0000" }, "committer": { "name": "Yao Chen", "email": "yaochen@google.com", "time": "Fri Sep 22 17:24:10 2023 +0000" }, "message": "Use readUniqueFileDescriptor in incidentd service\n\nreadFileDescriptor doesn\u0027t provide ownership of the fds. fdopen\nneeds ownership of the fds. Fds read from parcel should be duped\nin this scenario and readUniqueFileDescriptor dups fds internally.\n\nTest: m incidentd_service_fuzzer \u0026\u0026 adb sync data \u0026\u0026 adb shell /data/fuzz/x86_64/incidentd_service_fuzzer/incidentd_service_fuzzer\nTest: atest incidentd_test\nBug: 286931110\nBug: 283699145\n\nMerged-In: Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e\nChange-Id: Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e\n(cherry picked from commit ba78ef276951269f7b024baebdf1b8fa40bedb23)\n" }, { "commit": "67d39f879a91d8586559ed4c2b3c11c917c4c02f", "tree": "833580ad6f3f82732d2c1c214caa428f9b35d6dc", "parents": [ "f344a01ceb9e18bfb1c7519455f137602202a5cb", "933caefe553f84668690952e842ccf7e4789ffcd" ], "author": { "name": "Beatrice Marchegiani", "email": "beatricemarch@google.com", "time": "Fri Sep 22 15:29:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 22 15:29:29 2023 +0000" }, "message": "Merge changes from topic \"bmm-events\" into udc-qpr-dev am: 6f4c93a57a am: 933caefe55\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24770152\n\nChange-Id: I27c8b8db185a3650cbfc40d15d044560b16ea6b4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "933caefe553f84668690952e842ccf7e4789ffcd", "tree": "ed7ae55df07ce464740e534991f0a1e56dc07787", "parents": [ "2b2a3ff22cdbff81f2b2eed27a4fa516fb583d5a", "6f4c93a57adf142503c642734ea36e2a70867768" ], "author": { "name": "Beatrice Marchegiani", "email": "beatricemarch@google.com", "time": "Fri Sep 22 14:31:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 22 14:31:27 2023 +0000" }, "message": "Merge changes from topic \"bmm-events\" into udc-qpr-dev am: 6f4c93a57a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24770152\n\nChange-Id: I48429aeb7811ccf7f098cfdd79412f48c2750edd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f4c93a57adf142503c642734ea36e2a70867768", "tree": "63c8d1599de2f1b8a4fd1e081cc9b3d8d3316db4", "parents": [ "54234feac1216afceb75c292a4d9037cab593076", "0c5993fa0e39e4959a18994663923bbb2ddc44e1" ], "author": { "name": "Beatrice Marchegiani", "email": "beatricemarch@google.com", "time": "Fri Sep 22 14:06:39 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 22 14:06:39 2023 +0000" }, "message": "Merge changes from topic \"bmm-events\" into udc-qpr-dev\n\n* changes:\n Implement the ability to log extras relating to version mismatches between packages on the source and target. Imporve readability of events in dumpsys.\n Add a 2.5 MB size limit to the text file storing BMM Events.\n Add more BackupManagerMonitor events to PerformUnifiedRestoreTask.\n Add a 60 days retention period to BMM Events\n Overload putMonitoringExtra so that it can take an int as a parameter. This will allow to correcly store EXTRA_LOG_OPERATION_TYPE\n" }, { "commit": "501eeee21a5fb200b88b42eb8ed53be67bd16e56", "tree": "397e27982bccf37f7ff8224d60b5654f43520b40", "parents": [ "e8d8bf4d73d5f75858e93bdb4373217a7c00b9ed" ], "author": { "name": "beatricemarch", "email": "beatricemarch@google.com", "time": "Thu Aug 31 12:53:16 2023 +0000" }, "committer": { "name": "Beatrice Marchegiani", "email": "beatricemarch@google.com", "time": "Thu Sep 21 14:47:01 2023 +0000" }, "message": "Add more BackupManagerMonitor events to PerformUnifiedRestoreTask.\n\nIn particular\nadd events to cover\n-If this is KV or Full restore\n-For each package, when the restore started and when it ended\n-When a restore operation starts, if it is system restore or restore at install\n-Any errors\n\nTest: manual testing. Run `adb shell bmgr restore 1` and verify that the\nnew restore events are added to the dumpsys\natest CtsBackupHostTestCases, GtsBackupHostTestCases\natest BackupManagerMonitorDumpsysUtilsTest,\nBackupManagerMonitorEventSenderTest, UserBackupManagerServiceTest,\nPerformUnifiedRestoreTaskTest, BmgrTest\nBug: 290747920\n\nChange-Id: I0d221f10932fea3e8fb90a1827c7f1b5bf21d25d\n" }, { "commit": "ac345f8500664c51173eb7447b78846a89499c22", "tree": "312e713e869ffa47c5e88c2fdcb5191d41808dfb", "parents": [ "6905298aea9a4a52e1ac2e857031e789e51a7dac", "7a976b65fe2cdbe19620d12ce16839ea7e663955" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 14 00:44:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 14 00:44:57 2023 +0000" }, "message": "Merge \"Don\u0027t depend on String8 cast to C string\" into main am: 41363ba9fc am: d001ea5b72 am: 834467bdcc am: de14ea1930 am: 7a976b65fe\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044\n\nChange-Id: Id23e30ebeec4ddefc589a208bf5925cb2fa1816c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7a976b65fe2cdbe19620d12ce16839ea7e663955", "tree": "0ed79fb2ce1c76d378c84373accdc2bedd145e82", "parents": [ "a03b1b67fc6f702131cf2112781c4ea820866744", "de14ea1930186dcc0334159c4be56456d22ae244" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 14 00:32:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 14 00:32:42 2023 +0000" }, "message": "Merge \"Don\u0027t depend on String8 cast to C string\" into main am: 41363ba9fc am: d001ea5b72 am: 834467bdcc am: de14ea1930\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044\n\nChange-Id: I525be5e00332c07509dd24907d5a7581dff46be6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "834467bdcc1a799ece112553070593bbd4940455", "tree": "ff090d8a29609368f294044451100befff6ce5eb", "parents": [ "36a4442577e66659f9769c32b52315cec4a4acf6", "d001ea5b7242f110530e339d479b28b29dadc242" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Sep 13 23:04:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 13 23:04:25 2023 +0000" }, "message": "Merge \"Don\u0027t depend on String8 cast to C string\" into main am: 41363ba9fc am: d001ea5b72\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044\n\nChange-Id: Icc8df7b364fcda5e6cc734bdbef49e2d7dc43b76\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d001ea5b7242f110530e339d479b28b29dadc242", "tree": "461583516b23b03f09774f48e416790fed432551", "parents": [ "20bb26382d5244b979baa8a6d9a42cc92f208d5b", "41363ba9fceec76e0233db8889d75e986b91f39a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Sep 13 22:08:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 13 22:08:53 2023 +0000" }, "message": "Merge \"Don\u0027t depend on String8 cast to C string\" into main am: 41363ba9fc\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044\n\nChange-Id: I0ad1370690eb3763c4d2a7a361bc91f22fd15919\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41363ba9fceec76e0233db8889d75e986b91f39a", "tree": "a503827eb2943bb7e44c42c319a9f284c8e17cd8", "parents": [ "545d8455698f29d35c3ed0b85139016d5a15eb0c", "835dfe50a73c6f6de581aaa143c333af79bcca4d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Sep 13 21:26:45 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 13 21:26:45 2023 +0000" }, "message": "Merge \"Don\u0027t depend on String8 cast to C string\" into main" }, { "commit": "835dfe50a73c6f6de581aaa143c333af79bcca4d", "tree": "0bec830cab5de4388aafc4af0e357bfc327be1a0", "parents": [ "a235f8ba91dd467b245f680887e2a75507814b4e" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Aug 17 16:27:22 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Sep 12 22:31:10 2023 +0000" }, "message": "Don\u0027t depend on String8 cast to C string\n\nBug: 295394788\nTest: m checkbuild\nChange-Id: I6aa039b6b2a4944e3537ef133f8785890d957edd\n" }, { "commit": "6ce3f8c5cba1cf5366b1f14cfb580f159ef87e33", "tree": "cd36c4be523e15ada35d485a98a50f4a89548fb9", "parents": [ "10c3ca8d702f85c2a6d10f1b080c2eb8aff3c63d", "29165ab8efe2b985c545e10883b1a1b0c99dc5ee" ], "author": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Fri Sep 08 03:35:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 08 03:35:56 2023 +0000" }, "message": "Merge \"Add missing \u003citerator\u003e include for std::inserter\" into main am: 9a792ca278 am: 45fd5b7514 am: f30ba10d27 am: 29165ab8ef\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744334\n\nChange-Id: I2ed7a462b89f80d1b4b70b55fb3c0c525aa441ab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f30ba10d2732a4f4f2f2ff0220d2e09181d91dd0", "tree": "0bcca024fcccaa863d4426aec52c0cfe56b7a4a0", "parents": [ "bde2b2c03734185ed1abc3dbdcc7bde3cd4bf109", "45fd5b751455cca38ea4deb06f8ec73d84bab8f5" ], "author": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Fri Sep 08 02:11:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 08 02:11:30 2023 +0000" }, "message": "Merge \"Add missing \u003citerator\u003e include for std::inserter\" into main am: 9a792ca278 am: 45fd5b7514\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744334\n\nChange-Id: I51272bafa2eb89f5849751ac61826831237477b8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "45fd5b751455cca38ea4deb06f8ec73d84bab8f5", "tree": "3ac3450f122afb2e617db0173c0c045cb9875322", "parents": [ "805b597d1d6cb5dc01c4d02f0a66aa18f4c186d6", "9a792ca278e26cc4bc0de2812b83791ee1f67bde" ], "author": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Fri Sep 08 01:19:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 08 01:19:53 2023 +0000" }, "message": "Merge \"Add missing \u003citerator\u003e include for std::inserter\" into main am: 9a792ca278\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744334\n\nChange-Id: I819f46fb6cd0a2a16290d96cca2fa8fb76623dcf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "872b41155e21cf30e854d2628540f87647e3da32", "tree": "018f47034b4c596044e3df9f77d2615761c69500", "parents": [ "b303b74e0fa22c1167cfc668e8eb50c99688400c" ], "author": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Wed Sep 06 17:38:04 2023 -0700" }, "committer": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Wed Sep 06 17:40:37 2023 -0700" }, "message": "Add missing \u003citerator\u003e include for std::inserter\n\nBug: b/175635923\nTest: treehugger\nChange-Id: I241c8b2b48bb4c616fbc5b4ae1285e274182144b\nMerged-In: I241c8b2b48bb4c616fbc5b4ae1285e274182144b\n" }, { "commit": "59e7faed34ff45105892aa3e11db6ab87dee69c6", "tree": "d237c23602598fea64a784bf190a33ed921978a0", "parents": [ "57c84f5d66f5cdc95b734e3edeb6788a768ba4d9", "30170b1f4b1670a1fe71eaa5517f25c5e4f77747" ], "author": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Thu Sep 07 00:13:57 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 07 00:13:57 2023 +0000" }, "message": "Merge changes I241c8b2b,I9ab51f29,I6c231184 into main\n\n* changes:\n Add missing \u003citerator\u003e include for std::inserter\n Fix std::unique_ptr error with incomplete CommonFeatureGroup\n Move Theme::Entry definition to top of file\n" }, { "commit": "1f5b85230ab1d9ac886d29ccff8dc440242bf986", "tree": "f29e51dab7400a5962bce73c21e90d992787876a", "parents": [ "aa95ff271a31f903727c5ebc2e4990846c2073d2", "4dc044986487e3df8e309c7b9cce5fbe5694eed7" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Sep 06 19:49:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 06 19:49:43 2023 +0000" }, "message": "Merge \"Migrate String8|16.setTo to assignment operator\" into main am: c01e3ba035 am: 1ca55b9eb9 am: 6fd58092f6 am: af3d4530d8 am: 4dc0449864\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077\n\nChange-Id: I6ba4c4df589ed3851d1ac677b7078cac7015b6fa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0b4ead7922ec169c5be70d3546ffb3b5621ad340", "tree": "3b4f4818e7bb43f7cf81156ae86ee5e5487b3185", "parents": [ "2c4b39a2fb2c102e9e25d4a957400ab62cc1e11b" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 30 17:49:36 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Sep 06 19:08:54 2023 +0000" }, "message": "Use String8/16 c_str [idmap2, androidfw]\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: I95264e8bfc96a5adb7f7cc55a24dc0e8c126371d\n(cherry picked from commit a550a478f7f5d650b04cd30798fb9a28d95ed79c)\n" }, { "commit": "4dc044986487e3df8e309c7b9cce5fbe5694eed7", "tree": "ccff814da135202ae0fbebe005a82a827f5c37e5", "parents": [ "4fb86ec92a08a65e2ab52f8e361edb15b380cfc4", "af3d4530d8b6b833fb071ee35078170104b7d9ce" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Sep 06 18:54:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 06 18:54:36 2023 +0000" }, "message": "Merge \"Migrate String8|16.setTo to assignment operator\" into main am: c01e3ba035 am: 1ca55b9eb9 am: 6fd58092f6 am: af3d4530d8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077\n\nChange-Id: I23209be097511bfb4f4f6236ffad072833cb6a45\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6fd58092f603c2209f8058bab10e406bf3209372", "tree": "63f01498c4a491b619e2c4f3db5366712dd3824f", "parents": [ "9a80e1b70c9b9aaef268c8c0ea04b3fa5ce3debb", "1ca55b9eb9a7772e183fbb93c0a29edea3cd4a66" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Sep 06 17:31:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 06 17:31:31 2023 +0000" }, "message": "Merge \"Migrate String8|16.setTo to assignment operator\" into main am: c01e3ba035 am: 1ca55b9eb9\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077\n\nChange-Id: I956770cced86c5009aa908922bcb16166af9ac54\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1ca55b9eb9a7772e183fbb93c0a29edea3cd4a66", "tree": "2e3302f0eac9bc7f01e0146571a42f69770fdd2f", "parents": [ "0cfc1c6dddcc94b931a88c741eb99848b7741a6d", "c01e3ba0358b8c9b442c76a6758e4a9b712ae32f" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Sep 06 16:40:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 06 16:40:21 2023 +0000" }, "message": "Merge \"Migrate String8|16.setTo to assignment operator\" into main am: c01e3ba035\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077\n\nChange-Id: I4b4032ff4145ac6aa328723dd73151e1e7a021a5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1674a55b30d297d1ad816face008c01bdba975df", "tree": "43a3301f80b7c68d8018ef6d8352c5e0b4f1d3fd", "parents": [ "847137c659ad58700c80ffee7ea0739127b1f722", "e593ac80cf770a1122c8a03aea414da62a22fd60" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Sep 06 02:06:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 06 02:06:56 2023 +0000" }, "message": "Merge \"Use String8/16 c_str [idmap2, androidfw]\" into udc-dev-plus-aosp am: 6ee36e2b90 am: 6655b76c66 am: e593ac80cf\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24604702\n\nChange-Id: Ic147b562773897fae7c028a27b2c48ece51a8cea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e593ac80cf770a1122c8a03aea414da62a22fd60", "tree": "4d1520c124d3fde621dcaf9f1c6c8a0c52cecb95", "parents": [ "581464f4e296d9b85cee33f79fdbbb17176aa920", "6655b76c66594310e3d0dd15c59e10a8579c3cb2" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Sep 06 01:41:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 06 01:41:00 2023 +0000" }, "message": "Merge \"Use String8/16 c_str [idmap2, androidfw]\" into udc-dev-plus-aosp am: 6ee36e2b90 am: 6655b76c66\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24604702\n\nChange-Id: Id4af68b39e31fe070742a146c822ebb8f4bf0b2b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "31eb3c89a94d77eae9503bd635a4f056db3e3a31", "tree": "a3647fc0996bb1567be2aadc0393e0e780a3df71", "parents": [ "a199526dcdfcd77257ea28d65bf5a454320d939a" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 23 22:12:33 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Sep 05 21:45:12 2023 +0000" }, "message": "Migrate String8|16.setTo to assignment operator\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: I370f66c469de73064dec2e42c539dc236dd69d1e\n" }, { "commit": "a550a478f7f5d650b04cd30798fb9a28d95ed79c", "tree": "84798babc77cccf9bcf2ee7d4ddd9977d26c57c5", "parents": [ "a07ffaaa9084ca61b39af47393e557303dfc2496" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 30 17:49:36 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Sep 01 19:07:47 2023 +0000" }, "message": "Use String8/16 c_str [idmap2, androidfw]\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: I95264e8bfc96a5adb7f7cc55a24dc0e8c126371d\n" }, { "commit": "30170b1f4b1670a1fe71eaa5517f25c5e4f77747", "tree": "70e8f45a4e846c78b8beb3959e7d42d8ca5a6df9", "parents": [ "42d2e51bf78bec72031e5f7a70422851b302d1f4" ], "author": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Thu Aug 31 00:14:25 2023 -0700" }, "committer": { "name": "Ryan Prichard", "email": "rprichard@google.com", "time": "Thu Aug 31 19:06:45 2023 -0700" }, "message": "Add missing \u003citerator\u003e include for std::inserter\n\nBug: b/175635923\nTest: treehugger\nChange-Id: I241c8b2b48bb4c616fbc5b4ae1285e274182144b\n" }, { "commit": "e7de40d9600480732f1ba1f2b3c82920d8f55b88", "tree": "de37d5fdb82c48c6e8f4a22da65f93f6c34e974c", "parents": [ "98b8623c8e4623dfbbbc06b3dc10b411a428a375" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Aug 30 15:16:21 2023 -0700" }, "committer": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Aug 30 15:16:21 2023 -0700" }, "message": "Clean up the attribute searching func\n\nDon\u0027t convert each attribute name but instead only\ndo it once for the string they\u0027re compared to\n\nBug: 282215580\nTest: build + atest idmap2_tests\nChange-Id: I09f6d0f90f6c09632ceac8cdde7c20801f41524e\n" }, { "commit": "be999674418f8217075e7c260ee962c679bda690", "tree": "4aa945787729ffa8e52f07266b7ce8344250c72f", "parents": [ "0b77a08ab5a745c413f36d137709c7f92c0d44fa", "da845a7d94ece6a42dc3a10ba8d13f9a3abeb71c" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Aug 30 21:40:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 30 21:40:29 2023 +0000" }, "message": "Reland \"Use reference counted pointers for ApkAssets\" am: 1cf74939f4 am: da845a7d94\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23988011\n\nChange-Id: If75caa1ca9e3913f1a1a6b3bc8eb0a5f293de02c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "49efd0f0bec3009073d508868503ee25b6f39aa2", "tree": "556e3511c2811b9d49ff1157799317c15da38f89", "parents": [ "cfafa7a11a9e64627eba672a9576744598dff545", "48fc35819c70394a2ee675e798ed4dbcb4cf1b6c" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Aug 30 21:40:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 30 21:40:20 2023 +0000" }, "message": "Reland \"Use reference counted pointers for ApkAssets\" am: 1cf74939f4 am: da845a7d94 am: 48fc35819c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23988011\n\nChange-Id: Iad66bafd4a91a490865394464e982f0b38c312c0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "48fc35819c70394a2ee675e798ed4dbcb4cf1b6c", "tree": "50eaa018d828f8ae3f211d56980fa91152e046ce", "parents": [ "23bb1e822256eee7efb28e4dd86513d6462e1791", "da845a7d94ece6a42dc3a10ba8d13f9a3abeb71c" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Aug 30 21:03:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 30 21:03:04 2023 +0000" }, "message": "Reland \"Use reference counted pointers for ApkAssets\" am: 1cf74939f4 am: da845a7d94\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23988011\n\nChange-Id: I3dfc6e23ad48ebea5aee2589eb72af1302063a8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9ae55ba3d6b273910ab4861240b773597239338b", "tree": "551616ee3248c4e92d77d0c9d926b2c726461ec4", "parents": [ "11cbc92e8525138f5220bda7f555828b0eabcce9", "1cf74939f4623609341f1dd9b69616da88482c58" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Aug 30 20:54:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 30 20:54:21 2023 +0000" }, "message": "Reland \"Use reference counted pointers for ApkAssets\" am: 1cf74939f4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23988011\n\nChange-Id: Ia012b97dfaf169f0cb17c16080e0fc37c87cb626\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fafdf4e50c8374af92e8644f27c7eb4e904aaf7d", "tree": "d5fd5ab3c51b3cba9f12475c1bf5bddabb43e383", "parents": [ "9084ca7f4136bc33931fc76ab4557e202b2e4cbf", "35eaa6616059af0d771ba7cb89f7a7c1bb2c35a8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 30 00:52:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 30 00:52:59 2023 +0000" }, "message": "Merge \"Use String8/16 c_str\" into main am: 5af8505e4a am: 5accccc4c3 am: 83ab214b87 am: 093158d736 am: 35eaa66160\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704207\n\nChange-Id: Ic86288ea551b32c6a95ca134bdd0693d7dbce482\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "35eaa6616059af0d771ba7cb89f7a7c1bb2c35a8", "tree": "bcada1d4a4ede2ff339389d1f6b84d32bd79975a", "parents": [ "747bb66db0faab2c6ac34015c27fdc8af8c77a7a", "093158d736244dff64b13b4e57eb3ce186191db1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Aug 29 22:21:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 22:21:43 2023 +0000" }, "message": "Merge \"Use String8/16 c_str\" into main am: 5af8505e4a am: 5accccc4c3 am: 83ab214b87 am: 093158d736\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704207\n\nChange-Id: If3391f1880bb2d1f833d060b3737cf3c12f0dd85\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5accccc4c3c9d0b31922e15090ad407ddebad1aa", "tree": "7e7d43c06eca51a193735b883e97d38485bb3fad", "parents": [ "420ee2998010421e787b3c73a5a1ebb36e9de130", "5af8505e4a66ee4f49130ba9707858e11a7b744d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Aug 29 20:11:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:11:37 2023 +0000" }, "message": "Merge \"Use String8/16 c_str\" into main am: 5af8505e4a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704207\n\nChange-Id: I064ba4b2d7a47b8f84717181ff644be67284abc7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bcf12da283c7ecc4e082bdc741e84e5cbb4a1382", "tree": "df462cb72969a838b4e8baffa1c38a3d37ce8a48", "parents": [ "1900cef36631e64c923b69739d5432f6dc1b74d0", "d6a3e9aaa265080a29b58ec354e69ccfbf371f03" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Aug 29 19:39:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 19:39:48 2023 +0000" }, "message": "Merge \"Migrate from android::String isEmpty to empty [process]\" into main am: 846d6a30bc am: 4abf02bc37 am: c6a4960b26 am: 63979ebbb2 am: d6a3e9aaa2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2707679\n\nChange-Id: I5c37f78fea6b3e504109eafa01fca2f0cfc021ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3815d34e5f941909ceee9e879e309991c3d2a1d0", "tree": "35344372ca85cf8916d88f1294d79e31f77a1fd6", "parents": [ "6c8fb01159bf760c751e9fc3937512e4027d9699" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Aug 10 23:54:44 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Mon Aug 28 23:26:11 2023 +0000" }, "message": "Use String8/16 c_str\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: I538720d4de2dcc038b417048209782ff605b7e30\n" }, { "commit": "22d35f5ab502ee50ad7dc25597c21f7cc5951f55", "tree": "35b923cf376c11989cc526905cb5c57c387d13aa", "parents": [ "b8a745503d5b65cb9c95e842461a0f3fcbe855ae", "7d3ffbae618e9e728644a96647ed709bf39ae759" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 22:12:24 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 28 22:12:24 2023 +0000" }, "message": "Merge \"Merge Android U (ab/10368041)\" into aosp-main-future" }, { "commit": "b5b13e510c77c1e0951005b47451c7127525bc1e", "tree": "ca9e455a23954dc69d7635915c6894b0a4370cdc", "parents": [ "9734602a29db8db6b0dc5ec6088100608b985741", "34a4089b69d9444e055af1dd29b259ad3cde4b98" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Aug 28 19:45:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 19:45:04 2023 +0000" }, "message": "Merge \"Migrate from android::String isEmpty to empty [bootanimation]\" into main am: 1de5695524 am: 757b050795 am: 94faa18947 am: 4d51bc3da2 am: 34a4089b69\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725975\n\nChange-Id: I4c1ea79beb47456766940332593553e1e012c7b7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d6a3e9aaa265080a29b58ec354e69ccfbf371f03", "tree": "ae34044818406b4ec23419866d06734c3d9d11e8", "parents": [ "3e11b95a6d86bab93fcefa2deba69de9fe164bff", "63979ebbb2111b6837994054471a40e7ed99223e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Aug 28 12:51:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 12:51:35 2023 +0000" }, "message": "Merge \"Migrate from android::String isEmpty to empty [process]\" into main am: 846d6a30bc am: 4abf02bc37 am: c6a4960b26 am: 63979ebbb2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2707679\n\nChange-Id: I2907086146a0f56f47e71a5ff25068c86d3a409d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c6a4960b26b790b66018bba57bd958e34cc6e262", "tree": "9dac5dec11cb85c16ddc5c1efad1973650a1d8c1", "parents": [ "869f7f088bc84528f62dedcf1aa3f859c0c7abde", "4abf02bc374f9cbf889a5da0f83ade3828db787a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Aug 28 11:38:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 11:38:39 2023 +0000" }, "message": "Merge \"Migrate from android::String isEmpty to empty [process]\" into main am: 846d6a30bc am: 4abf02bc37\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2707679\n\nChange-Id: I71c38ff2c5990a71c95fba1b573067d3e450a1fc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "846d6a30bc9e84662743d65337281d3d83cc2ad8", "tree": "cb51c2cfa05ca556045ceec67758602389ece47c", "parents": [ "cd4aae5f6d79836fef7a0653b3b53edb4304108e", "5c0887b8f1c5c535b861441a372ca1b4d7e9f614" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Aug 28 10:16:49 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 28 10:16:49 2023 +0000" }, "message": "Merge \"Migrate from android::String isEmpty to empty [process]\" into main" }, { "commit": "7d3ffbae618e9e728644a96647ed709bf39ae759", "tree": "ab369a30c6a0e17a69c8f80c6353be4de3692e10", "parents": [ "a8a87bbca9162af7add830139198c4ee899fa123", "8a809c6e46007521f75ac035ad4b1dcc1d00d9cf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 25 12:59:08 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 25 12:59:08 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I3c9e9d15786fbead1b874636b46844f6c24bccc2\nChange-Id: Id6cf6cc13baef4e67486c6271a1510146204affa\n" }, { "commit": "34a4089b69d9444e055af1dd29b259ad3cde4b98", "tree": "f4e40419b6732e016193c83c74a605869b776fd9", "parents": [ "ae27609c55d51f986da6bf28160e2a260cb00916", "4d51bc3da2647c7adee577ca6691f5161e6fc537" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 25 19:41:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 25 19:41:31 2023 +0000" }, "message": "Merge \"Migrate from android::String isEmpty to empty [bootanimation]\" into main am: 1de5695524 am: 757b050795 am: 94faa18947 am: 4d51bc3da2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725975\n\nChange-Id: I2e7e38a18b2242505d512b46072dfd4cbd2d7f4c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "94faa189471998c7d06a2c660734702c0ea72afc", "tree": "9499e4d2c9865428d7cbc82d768b41f684b3937f", "parents": [ "331c2ad9f925916e2ead780d767b66442a208061", "757b050795a5246423dd29b7f0a7630ae4f2fe8a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 25 18:25:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 25 18:25:07 2023 +0000" }, "message": "Merge \"Migrate from android::String isEmpty to empty [bootanimation]\" into main am: 1de5695524 am: 757b050795\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725975\n\nChange-Id: Id484fc0a654d54c8952606048bde03fdb7544372\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1955ddb270f57510f2853048981ed30458211bfc", "tree": "f98a804d58a72154a83fcaa035731f6051e3c768", "parents": [ "501290336aaff9d7ae2401838c692817ef4e7e00", "5a71f9d3cfc8c7e652c0881ac848d98601f6b1c7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 24 20:08:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 24 20:08:05 2023 +0000" }, "message": "Merge \"Use String8/16 c_str [backup]\" into main am: 8092c2119e am: a85cf17105 am: 50c93d48f0 am: 41026a385a am: 5a71f9d3cf\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724075\n\nChange-Id: I38905f46bcfff581ca16a0dcb0928c3acf684b3e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5a71f9d3cfc8c7e652c0881ac848d98601f6b1c7", "tree": "b8b75524847a787bbd52a82584e16927661f6602", "parents": [ "93b698d27ab608e1f2cb405ace22ecd98d4f768a", "41026a385affb5e7ab83efa2f93e2833480c73de" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 24 19:19:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 24 19:19:32 2023 +0000" }, "message": "Merge \"Use String8/16 c_str [backup]\" into main am: 8092c2119e am: a85cf17105 am: 50c93d48f0 am: 41026a385a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724075\n\nChange-Id: I74b2bc06e41c557f6767875700b575b14e25d27e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5c0887b8f1c5c535b861441a372ca1b4d7e9f614", "tree": "553f5a24e34b4f1425f0054df9eeeeafa14b8fc1", "parents": [ "34b915e1419a2fa18c8815d9b3193a02968c2047" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Mon Aug 14 17:59:56 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Aug 24 19:13:35 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty [process]\n\nThis empty method is different from the old one - it aligns with\nstd::string definition.\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: I1900997f36327af8c3d12b4f77971fdd96080616\n" }, { "commit": "e8fb3c7c870065e48fd338fca07192b33fb0237b", "tree": "417603a7211387b991e540fa3b1af737838619a1", "parents": [ "34b915e1419a2fa18c8815d9b3193a02968c2047" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Aug 24 19:11:22 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Aug 24 19:11:22 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty [bootanimation]\n\nThis empty method is different from the old one - it aligns with\nstd::string definition.\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: Ib80c839df7ff7e3fb0ed2df7a00393d843d44d9d\n" }, { "commit": "50c93d48f0878610efec49b714cc1f90699d5078", "tree": "dab87dabe5ae7ec8d68965d70ef5c3bc01d9887e", "parents": [ "90f2ecfc2aa53f5eff8ff9e2278313d6d76c040f", "a85cf17105adaf492ae1287a654c88921d5bf0a6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 24 18:05:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 24 18:05:47 2023 +0000" }, "message": "Merge \"Use String8/16 c_str [backup]\" into main am: 8092c2119e am: a85cf17105\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724075\n\nChange-Id: I37ada3a4cf770011358540aa14bbeaafb94d91cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8092c2119ebd8c7b4de6aa852dcfb5f39d1f4d7c", "tree": "98157882c639c6fd643f6f1ee0ea568ca01385f4", "parents": [ "5908abd413b81b6bb100fe51481f9dd9fb53c17c", "389e381542f4ed0218dcaf42ecb62466e1e0b088" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 24 17:04:26 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 24 17:04:26 2023 +0000" }, "message": "Merge \"Use String8/16 c_str [backup]\" into main" }, { "commit": "09e51cbebd3cb3f2e3d8ddbdc89584367e447e6a", "tree": "0a6bc420852e8de269ad2c3e908084161c4acb06", "parents": [ "482ddf2ae1d5d8f2e1e08a901b7cd1d7a3631192", "c9a386e0de94c124d2f164d9a4c5d6fcfc50cc42" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 23 20:36:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 23 20:36:59 2023 +0000" }, "message": "Merge \"Migrate from android::String path functions to std::filesystem\" into main am: e27e15d330 am: 51858976fe am: b0f9564c48 am: e57b90e810 am: c9a386e0de\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2721506\n\nChange-Id: If0df1da5708bd340dfe1fc505bef53f2a51592fe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9a386e0de94c124d2f164d9a4c5d6fcfc50cc42", "tree": "b5c8bce51bccc9c4d895276b4765d7cef8e49f41", "parents": [ "db5d5d3a97940228ccb11073c7bb6de2c40f8bf9", "e57b90e810633c22d58f14ad222c5fb3644180c4" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 23 19:47:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 23 19:47:31 2023 +0000" }, "message": "Merge \"Migrate from android::String path functions to std::filesystem\" into main am: e27e15d330 am: 51858976fe am: b0f9564c48 am: e57b90e810\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2721506\n\nChange-Id: Ia3c12ebc1112eb1d4edda135b6ae1825c1947d1e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b0f9564c48311768667e5778417d2f8dabb6202f", "tree": "33970e4a09a2fd402a0ed65b656a6180529ffab5", "parents": [ "63d99ccbfe89449c0d8c95f9e7e07688289a3317", "51858976fedeb6ecad2badee261c7d64b1827499" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 23 19:16:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 23 19:16:45 2023 +0000" }, "message": "Merge \"Migrate from android::String path functions to std::filesystem\" into main am: e27e15d330 am: 51858976fe\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2721506\n\nChange-Id: I2d39f1847e08a6bb351825d07e6050d16343ea46\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "389e381542f4ed0218dcaf42ecb62466e1e0b088", "tree": "4da0ab7d3d2ba72787a420a73988b06288cff4e2", "parents": [ "a2d740da81964480f384a4925fe7ddcf3782a498" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 23 18:20:15 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 23 18:54:15 2023 +0000" }, "message": "Use String8/16 c_str [backup]\n\nBug: 295394788\nTest: TH\nChange-Id: I8e87ed078797cc941a16d1b2a3f96e0d668bf4ec\n" }, { "commit": "9dcea573208cde8353a79e9433390809031473d4", "tree": "07c621543a3ad2e8bb2351ccaa3602365a0c67b8", "parents": [ "eb1ddf020482df7ea233c28350ee4e51b556b4f6" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Aug 22 20:39:20 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Aug 23 17:44:11 2023 +0000" }, "message": "Migrate from android::String path functions to std::filesystem\n\nBug: 295394788\nTest: m checkbuild\nChange-Id: I2e3167aaf464132127d5838075c7f9a5257ed275\n" } ], "next": "6befa78b57f76658b3920a3c734f0d3c5c91b8dd" }