)]}' { "log": [ { "commit": "fbe92b6c53460073be08ed8eefdca60cacdda7e5", "tree": "9d727cd7fd15ddd6d4ef96b58fa70f1a512b657b", "parents": [ "5325f2b2b37c6197174b4dbb2e6095ebeb2ed9e6" ], "author": { "name": "Hwangoo Park", "email": "hwangoo@google.com", "time": "Tue Nov 14 14:32:43 2023 +0000" }, "committer": { "name": "Hwangoo Park", "email": "hwangoo@google.com", "time": "Tue Jan 09 00:35:51 2024 +0000" }, "message": "Add a new permission for domain selection service\n\nThis change adds BIND_DOMAIN_SELECTION_SERVICE permission to be used by\na DomainSelectionService to ensure that only the system binds to it.\nIt also grants the permission to the Phone process.\n\nBug: 258112541\nTest: build\nChange-Id: I5f544136c5227d1154bd817be3c53b2584f44ca1\n" }, { "commit": "5325f2b2b37c6197174b4dbb2e6095ebeb2ed9e6", "tree": "beeca6f71e8a073107ab3d960516ce99358e749c", "parents": [ "f5eae9148c5096bd6e791afa7cfa1c568b9104a7", "63ad09003c1595f4fa3b0bf65e0c1ec7f508477a" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Tue Nov 14 03:59:01 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 03:59:01 2023 +0000" }, "message": "Merge changes Iff50fbf8,Ibfd590be,Ibc4484bb into main\n\n* changes:\n Add logging to LogBuffer\n Refactor VisualInterruptionDecisionProviderImpl\n Improve tests and add missing test cases\n" }, { "commit": "f5eae9148c5096bd6e791afa7cfa1c568b9104a7", "tree": "829bad50d4c06fae4b3d31ad0a4673f7a016b1b0", "parents": [ "eb76226242c7960a425992d31f957220f02304de", "89b7f6250b828222e3741936ebba8c1293d19557" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Tue Nov 14 03:31:26 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 03:31:26 2023 +0000" }, "message": "Merge \"Expose Apn Setting Field api\u0027s\" into main" }, { "commit": "eb76226242c7960a425992d31f957220f02304de", "tree": "fab0e54f9bae7c8dd1175ffbc0c68e17f4ba8354", "parents": [ "5d4b021f11756295e3c8c7837fabcbf4531d6429", "0234597bdfa9386a493cfd39da3f61c2e5a0ba09" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Tue Nov 14 02:51:53 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 02:51:53 2023 +0000" }, "message": "Merge changes from topic \"nic-collection-sync\" into main\n\n* changes:\n Prevent desync of NICViewBinder + NotifCollection\n Fix heads up isolated notif icon race condition\n" }, { "commit": "5d4b021f11756295e3c8c7837fabcbf4531d6429", "tree": "8f8c18b274c69c6f8a06acc51f9a7aa13bd12044", "parents": [ "bb95bb3e97580cf8fa314f71872bcb136d6f8957", "956bb57e156bd1ad91787c4af406cdecd0e29dbf" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 14 02:37:04 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 02:37:04 2023 +0000" }, "message": "Merge \"[PM] Add invisible label detection in Launcher apps\" into main" }, { "commit": "bb95bb3e97580cf8fa314f71872bcb136d6f8957", "tree": "85c350c289e501e64044f0acea648b6cabb823c6", "parents": [ "d756cbc990265eee1b10d995e33dd524b5c3b745", "332b2f26492f62cd792e48960602c25b53c25e53" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Nov 14 02:02:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 02:02:49 2023 +0000" }, "message": "Merge \"Add DomainSelection owners for Telephony APIs\" into main am: 2d2d98a810 am: fda185b806 am: 332b2f2649\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2825630\n\nChange-Id: Iba4e398e0fa5073284f6b10b45c518c7a1abb1d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "332b2f26492f62cd792e48960602c25b53c25e53", "tree": "f93c778a26ca3a9698d7900ddad4b38298425826", "parents": [ "74d985f78627a46524aab64b9daafd333f3c2fb9", "fda185b806ea59c361c0a225044440521d97f0a3" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Nov 14 02:01:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 02:01:19 2023 +0000" }, "message": "Merge \"Add DomainSelection owners for Telephony APIs\" into main am: 2d2d98a810 am: fda185b806\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2825630\n\nChange-Id: Ib67a5e08d5ced2411c347059131eabf2df6b4a72\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d756cbc990265eee1b10d995e33dd524b5c3b745", "tree": "85c350c289e501e64044f0acea648b6cabb823c6", "parents": [ "5bfab582a699e40edc71ad9e41fceb54d532977b", "74d985f78627a46524aab64b9daafd333f3c2fb9" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Nov 14 02:00:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 02:00:29 2023 +0000" }, "message": "Merge \"Add DomainSelection owners for Telephony APIs\" into main am: 2d2d98a810 am: 75b3ed8f14 am: 74d985f786\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2825630\n\nChange-Id: Id72a40c8dc9060130799f667ec32e2ddaa652a2a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "74d985f78627a46524aab64b9daafd333f3c2fb9", "tree": "f93c778a26ca3a9698d7900ddad4b38298425826", "parents": [ "6bea09c1b42cd3b542150f7bd568286d456e50b1", "75b3ed8f140c5a8f594a4b289353bb56e0250a2f" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Nov 14 01:59:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 01:59:43 2023 +0000" }, "message": "Merge \"Add DomainSelection owners for Telephony APIs\" into main am: 2d2d98a810 am: 75b3ed8f14\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2825630\n\nChange-Id: I8ac5b461b3b0607b8dcb7aafbf408ead0c0bade5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5bfab582a699e40edc71ad9e41fceb54d532977b", "tree": "0480f531878a53ec96bc034c0ca9178febd7a2c8", "parents": [ "a2c358ce351e49da0c7ec296d7959acfb14b7a2b", "bc76f97c4504083f19b4e7a3a62383ffc8bf9b41" ], "author": { "name": "Achim Thesmann", "email": "achim@google.com", "time": "Tue Nov 14 01:42:13 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 01:42:13 2023 +0000" }, "message": "Merge \"Switch toast to different experiment\" into main" }, { "commit": "fda185b806ea59c361c0a225044440521d97f0a3", "tree": "c9865761d2be8d36d457448bbdb525da4828ca63", "parents": [ "1d11f0851682385d2220cb454b8761e5023b0bcd", "2d2d98a810be043275bc5a7cbb28140cb3b082e5" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Nov 14 01:29:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 01:29:05 2023 +0000" }, "message": "Merge \"Add DomainSelection owners for Telephony APIs\" into main am: 2d2d98a810\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2825630\n\nChange-Id: I095ca37d33c33fc8c65bcf1d6103f71b213f3199\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75b3ed8f140c5a8f594a4b289353bb56e0250a2f", "tree": "39179f8d7d58fdc21b6cb8eb63d2651481a5dd9a", "parents": [ "b68085f552cd11ebe6078640ab2ea571ae02e48f", "2d2d98a810be043275bc5a7cbb28140cb3b082e5" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Nov 14 01:28:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 01:28:55 2023 +0000" }, "message": "Merge \"Add DomainSelection owners for Telephony APIs\" into main am: 2d2d98a810\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2825630\n\nChange-Id: Ida7a26f5e5474b6545dbefb53333708f071d228e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a2c358ce351e49da0c7ec296d7959acfb14b7a2b", "tree": "11ad5fcb4af88ac044678774304c0bb2b3d21008", "parents": [ "28df6d69a170c7b2af89df9083868339c9dbd76f", "6bea09c1b42cd3b542150f7bd568286d456e50b1" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 01:27:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 01:27:04 2023 +0000" }, "message": "Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b am: 1d11f08516 am: 6bea09c1b4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817094\n\nChange-Id: I68babb5c0f5a1801b128c7c0b8dff1b4688e80e4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "28df6d69a170c7b2af89df9083868339c9dbd76f", "tree": "11ad5fcb4af88ac044678774304c0bb2b3d21008", "parents": [ "a3de003a3aa978dbe85159e1fb4e2717b70c0fa4", "c9ea26e5cbcd1d8a4237a261c26541276aac7e98" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 01:26:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 01:26:11 2023 +0000" }, "message": "Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b am: b68085f552 am: c9ea26e5cb\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817094\n\nChange-Id: Ie7d7ffb021c43d34e90957d0d40e70478a849008\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a3de003a3aa978dbe85159e1fb4e2717b70c0fa4", "tree": "11f022b761b76393e4ff9758db40b2b3eaaaa789", "parents": [ "425c25c0f7a64ea41dd5f870bf0d04477ab24fdf", "48fb30e84b8c08e5efc0db7e7a862da397c43131" ], "author": { "name": "Matt Walliser", "email": "mattwalliser@google.com", "time": "Tue Nov 14 01:15:12 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 01:15:12 2023 +0000" }, "message": "Merge \"Restore connecting state for hotspot network on service connected.\" into main" }, { "commit": "425c25c0f7a64ea41dd5f870bf0d04477ab24fdf", "tree": "cb2cf343bd13044f356ebb324101b0ee56338d33", "parents": [ "4ad7b4d796a2ddfd51bcdc42f9764d93ae571399", "8978973fcddea3967c545f55f68a1902f3117ab1" ], "author": { "name": "Faye Yan", "email": "fayey@google.com", "time": "Tue Nov 14 01:02:31 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 01:02:31 2023 +0000" }, "message": "Merge \"Add flag for enabling the ECM Service and Manager APIs.\" into main" }, { "commit": "6bea09c1b42cd3b542150f7bd568286d456e50b1", "tree": "34f4ea45b38dcdeb020e526030dbf06d1a490d30", "parents": [ "c9ea26e5cbcd1d8a4237a261c26541276aac7e98", "1d11f0851682385d2220cb454b8761e5023b0bcd" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 00:55:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:55:18 2023 +0000" }, "message": "Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b am: 1d11f08516\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817094\n\nChange-Id: If3ef9e86bcb064f74678c9ffd9b9a358127b1db5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2d2d98a810be043275bc5a7cbb28140cb3b082e5", "tree": "29abdd777c6721060dddedfe9930a5e3761ba9ec", "parents": [ "dcd948462b64c4da47f1030321fb4aca2eaa59fc", "7cd8b36301836f2dfcb0ec7a5522185a5787d793" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Tue Nov 14 00:54:11 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 14 00:54:11 2023 +0000" }, "message": "Merge \"Add DomainSelection owners for Telephony APIs\" into main" }, { "commit": "c9ea26e5cbcd1d8a4237a261c26541276aac7e98", "tree": "34f4ea45b38dcdeb020e526030dbf06d1a490d30", "parents": [ "269b7a000204033d79b669f53c09053ba300721b", "b68085f552cd11ebe6078640ab2ea571ae02e48f" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 00:53:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:53:27 2023 +0000" }, "message": "Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b am: b68085f552\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817094\n\nChange-Id: Id24b4725a37501ff50433e8cc197ead012a2dab2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4ad7b4d796a2ddfd51bcdc42f9764d93ae571399", "tree": "7cf6b9ff0a07e9cd85aae22ef87b0b5894e9ff04", "parents": [ "b393caaaff94dab4d47ce477386501363c88d771", "b3fa023052fbc849093d9ce59adb3d150a8466ad" ], "author": { "name": "Hakjun Choi", "email": "hakjunc@google.com", "time": "Tue Nov 14 00:49:28 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 00:49:28 2023 +0000" }, "message": "Merge \"Create a device config indicates whether to send message in demo mode or not\" into main" }, { "commit": "b68085f552cd11ebe6078640ab2ea571ae02e48f", "tree": "1c98c2027d344176093e168338cea801a7ddf135", "parents": [ "3ded59672074c71ff30339e8383e01411076a263", "dcd948462b64c4da47f1030321fb4aca2eaa59fc" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 00:23:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:23:37 2023 +0000" }, "message": "Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817094\n\nChange-Id: I5a1d80802557783aa02b1b17b60adb66e985707e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1d11f0851682385d2220cb454b8761e5023b0bcd", "tree": "9c81bec19083ac247a8e169d2f4ea30bf50f402e", "parents": [ "e85b64e0fc05921ecfe994098e1a3cc35863c621", "dcd948462b64c4da47f1030321fb4aca2eaa59fc" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 00:23:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:23:31 2023 +0000" }, "message": "Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817094\n\nChange-Id: I1d1aab5b358d98ae54c889f88e7609ab3d285923\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b393caaaff94dab4d47ce477386501363c88d771", "tree": "7059635283d560ddec18f29bbf319125295aa236", "parents": [ "3d95ea1aebf4f2d799b92a955d1f20d070c303f3", "269b7a000204033d79b669f53c09053ba300721b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 14 00:22:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:22:20 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-qpr-dev am: bc0d80aa0a -s ours am: 269b7a0002 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359243\n\nChange-Id: I0aef3ae39d28f66eef7499658fec58cbf7a5c8d0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3d95ea1aebf4f2d799b92a955d1f20d070c303f3", "tree": "7059635283d560ddec18f29bbf319125295aa236", "parents": [ "75f5144f1b7095748709d1f27ad9edff5ba4feaa", "fd63f25953b1e5b358119cd390d3dc692dab23f1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 14 00:22:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:22:06 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 531e139d19 -s ours am: fd63f25953 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359243\n\nChange-Id: Id0368c8c211e92312f7396b3329dfc426d1ab477\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75f5144f1b7095748709d1f27ad9edff5ba4feaa", "tree": "7059635283d560ddec18f29bbf319125295aa236", "parents": [ "e9642660ca8fd783684cf10e635b358662579b0d", "c25f5e0764811614e19decf345c63dd1888edc84" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 14 00:21:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:21:41 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-qpr-dev am: 3687e36853 -s ours am: c25f5e0764 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359043\n\nChange-Id: I343af41bba970ae957c6a82c3341cc6570019290\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e9642660ca8fd783684cf10e635b358662579b0d", "tree": "7059635283d560ddec18f29bbf319125295aa236", "parents": [ "8573e3dca8dd9c6e7d0de98defb51fb09bfdbe09", "dff118ed70b52ed0b84b006eb5de8d2cb1b4aea3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 14 00:21:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:21:20 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 269b986446 -s ours am: dff118ed70 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359043\n\nChange-Id: Id2de8059198ee9b01cb176950a4981967b2b8de2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8573e3dca8dd9c6e7d0de98defb51fb09bfdbe09", "tree": "7059635283d560ddec18f29bbf319125295aa236", "parents": [ "5983e9a4ab58687350dd59b8461addeef8fd9bb2", "fc9ba4aa6ed6a5559c79b7eec15fe943ce98dac1" ], "author": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Tue Nov 14 00:13:40 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 14 00:13:40 2023 +0000" }, "message": "Merge \"New aconfig flag for coroutine tracing\" into main" }, { "commit": "269b7a000204033d79b669f53c09053ba300721b", "tree": "28675235095875896545e3ebbc5e12c42c00fc1c", "parents": [ "fd63f25953b1e5b358119cd390d3dc692dab23f1", "bc0d80aa0a4d294b4f570c8f3f864ea118fe2c46" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 14 00:11:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:11:11 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-qpr-dev am: bc0d80aa0a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359243\n\nChange-Id: Id26a70f7533dcf4a083dffb8f2596e0ffe09be07\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fd63f25953b1e5b358119cd390d3dc692dab23f1", "tree": "28675235095875896545e3ebbc5e12c42c00fc1c", "parents": [ "c25f5e0764811614e19decf345c63dd1888edc84", "531e139d19c68d980f25f8cac277317d0cabb1ce" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 14 00:10:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:10:47 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 531e139d19 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359243\n\nChange-Id: Iab345a9fca831d529b1af3023e3c6f004d3b2386\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c25f5e0764811614e19decf345c63dd1888edc84", "tree": "28675235095875896545e3ebbc5e12c42c00fc1c", "parents": [ "dff118ed70b52ed0b84b006eb5de8d2cb1b4aea3", "3687e3685320c5036aa6f3e1f992f3321185d717" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 14 00:10:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:10:21 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-qpr-dev am: 3687e36853 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359043\n\nChange-Id: I73a0714e53d13a8ceeb2e1b8d90b8ba5d2e5fd78\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dff118ed70b52ed0b84b006eb5de8d2cb1b4aea3", "tree": "28675235095875896545e3ebbc5e12c42c00fc1c", "parents": [ "4d0dd25390f962061ec34f8a1e12c8f9a5013608", "269b9864464e898e0b44853f63f78598dd1f8ec4" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 14 00:09:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:09:45 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 269b986446 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25359043\n\nChange-Id: I2f749b2380ee55ce395cd4c452114c81c8e43f84\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5983e9a4ab58687350dd59b8461addeef8fd9bb2", "tree": "b2449cce2a76babaa822142fa029aaf89188fa01", "parents": [ "68a04679ab7255a93ab27faaf4fbaf1582bfd33b", "4d0dd25390f962061ec34f8a1e12c8f9a5013608" ], "author": { "name": "Mark Punzalan", "email": "markpun@google.com", "time": "Tue Nov 14 00:07:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:07:18 2023 +0000" }, "message": "Merge \"[aapt2] Parse --feature-flags parameter values\" into main am: 21bbfb8754 am: e85b64e0fc am: 4d0dd25390\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813074\n\nChange-Id: Iaa298b7dc8d73da61c3df2424787bc80727b86d8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "68a04679ab7255a93ab27faaf4fbaf1582bfd33b", "tree": "b2449cce2a76babaa822142fa029aaf89188fa01", "parents": [ "668cb32166321b2813d6b34f82bfd2f3dc16b592", "9cc4f4897125b3738da65556f3dbff1333973336" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 00:06:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:06:47 2023 +0000" }, "message": "Merge \"lint: update documentation on how to update the baseline\" into main am: bc9d6797ec am: 719febf831 am: 9cc4f48971\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815153\n\nChange-Id: Ib8b440bc9ab662657bac13720023263b406bea2f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "668cb32166321b2813d6b34f82bfd2f3dc16b592", "tree": "b2449cce2a76babaa822142fa029aaf89188fa01", "parents": [ "40455586de754741810d23111cf2f9e7e972e0b0", "7b65ed04876328894b2773bb5ca7b2fa2d1039ac" ], "author": { "name": "Mark Punzalan", "email": "markpun@google.com", "time": "Tue Nov 14 00:06:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:06:00 2023 +0000" }, "message": "Merge \"[aapt2] Parse --feature-flags parameter values\" into main am: 21bbfb8754 am: 3ded596720 am: 7b65ed0487\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813074\n\nChange-Id: I7e95d4f810d305affdf090755e515551a3fc5bcb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "40455586de754741810d23111cf2f9e7e972e0b0", "tree": "b879f92e035863e0187dd8b6d8be8b4285d6b0c7", "parents": [ "8b610d61cdcf02b0b2ef2bc5588e44cd72281726", "55b93b2bf994fe857c68f66cfa2680c74a579a32" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Tue Nov 14 00:05:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 14 00:05:12 2023 +0000" }, "message": "Merge \"lint: update documentation on how to update the baseline\" into main am: bc9d6797ec am: 195230e096 am: 55b93b2bf9\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815153\n\nChange-Id: I7ed48f73d14c10f780a3430d1931ec398a5619b6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b610d61cdcf02b0b2ef2bc5588e44cd72281726", "tree": "7dce9faecb3cb9bf264bda48898a1eeaf8cc67a4", "parents": [ "0cd998a41f2847d978573485d3d880ab90eb29ea", "e9558bae5d4f6c4ca02d76a9bd53f1c66ce50ca5" ], "author": { "name": "Shilpa Satish", "email": "shilpasatish@google.com", "time": "Mon Nov 13 23:54:36 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 23:54:36 2023 +0000" }, "message": "Merge \"Adding CONNECTIVITY_KEEP_DATA_ON to handle Safety Situation\" into main" }, { "commit": "dcd948462b64c4da47f1030321fb4aca2eaa59fc", "tree": "5094eaeb11a3e6f745dc2db105f6ce31e6f4589d", "parents": [ "21bbfb87548b04e5e02989a8743510b5619796e3", "627faea6c8ca730f5fb0d0a1ef86e0c5e13a2cd2" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Mon Nov 13 23:49:26 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 13 23:49:26 2023 +0000" }, "message": "Merge changes I0fbd41b6,If791b6d8 into main\n\n* changes:\n Add PermissionAnnotationDetector\n Ignore superMethods from non-Stub parents\n" }, { "commit": "4d0dd25390f962061ec34f8a1e12c8f9a5013608", "tree": "28675235095875896545e3ebbc5e12c42c00fc1c", "parents": [ "9cc4f4897125b3738da65556f3dbff1333973336", "e85b64e0fc05921ecfe994098e1a3cc35863c621" ], "author": { "name": "Mark Punzalan", "email": "markpun@google.com", "time": "Mon Nov 13 23:34:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:34:36 2023 +0000" }, "message": "Merge \"[aapt2] Parse --feature-flags parameter values\" into main am: 21bbfb8754 am: e85b64e0fc\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813074\n\nChange-Id: Ieb1f63bbcc327d74c19c33a0744a4484b316a116\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9cc4f4897125b3738da65556f3dbff1333973336", "tree": "28675235095875896545e3ebbc5e12c42c00fc1c", "parents": [ "7b65ed04876328894b2773bb5ca7b2fa2d1039ac", "719febf831ae67f29adff9802063bc9a199a5aee" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Mon Nov 13 23:34:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:34:01 2023 +0000" }, "message": "Merge \"lint: update documentation on how to update the baseline\" into main am: bc9d6797ec am: 719febf831\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815153\n\nChange-Id: Ie3e76f0967824f6068a8ee4c85a0e8a99f2e82f4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8978973fcddea3967c545f55f68a1902f3117ab1", "tree": "074e7f1b7f587017eed03d3f959febd0d8c68cc0", "parents": [ "0cd998a41f2847d978573485d3d880ab90eb29ea" ], "author": { "name": "fayey", "email": "fayey@google.com", "time": "Mon Nov 13 23:16:51 2023 +0000" }, "committer": { "name": "Faye Yan", "email": "fayey@google.com", "time": "Mon Nov 13 23:32:48 2023 +0000" }, "message": "Add flag for enabling the ECM Service and Manager APIs.\n\nBug: 310220212\nBug: 310220073\nTest: presubmit\nChange-Id: I605203c739ca5a19992d30674d5cb2d1a0a926aa\n" }, { "commit": "7b65ed04876328894b2773bb5ca7b2fa2d1039ac", "tree": "28675235095875896545e3ebbc5e12c42c00fc1c", "parents": [ "55b93b2bf994fe857c68f66cfa2680c74a579a32", "3ded59672074c71ff30339e8383e01411076a263" ], "author": { "name": "Mark Punzalan", "email": "markpun@google.com", "time": "Mon Nov 13 23:32:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:32:43 2023 +0000" }, "message": "Merge \"[aapt2] Parse --feature-flags parameter values\" into main am: 21bbfb8754 am: 3ded596720\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813074\n\nChange-Id: I401d2de1bfaf733ff5ae814b3ae7f8b9f777c421\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "55b93b2bf994fe857c68f66cfa2680c74a579a32", "tree": "c1fea91e638e1b582d7dc0d0138277e84befa994", "parents": [ "32443e3266d0599a0f9a5e5fb50e1a55bb70dee4", "195230e096e59dc2e407c329ffacffd5d5c8adfa" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Mon Nov 13 23:32:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:32:25 2023 +0000" }, "message": "Merge \"lint: update documentation on how to update the baseline\" into main am: bc9d6797ec am: 195230e096\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815153\n\nChange-Id: I761e25bf2dcba7c2518205b234a8f369b7443705\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bc0d80aa0a4d294b4f570c8f3f864ea118fe2c46", "tree": "fb1d855fdd327d3ef3ae859dabaa74f5017d5ab8", "parents": [ "3687e3685320c5036aa6f3e1f992f3321185d717", "531e139d19c68d980f25f8cac277317d0cabb1ce" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 13 23:28:29 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 23:28:29 2023 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-qpr-dev" }, { "commit": "3687e3685320c5036aa6f3e1f992f3321185d717", "tree": "a6e31046be3701d71f76ff6c018e7f45241aaea4", "parents": [ "58e26a57800a40de88b2574102abc2908a226243", "269b9864464e898e0b44853f63f78598dd1f8ec4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 13 23:28:29 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 23:28:29 2023 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-qpr-dev" }, { "commit": "0cd998a41f2847d978573485d3d880ab90eb29ea", "tree": "0314341f43bd721f5251559c264dab9b27734716", "parents": [ "f9e43f59c89592a71f026e352404437281ea724a", "32443e3266d0599a0f9a5e5fb50e1a55bb70dee4" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 23:17:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:17:44 2023 +0000" }, "message": "Merge \"Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\" into main am: 3065779a38 am: 608741d17c am: 32443e3266\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492\n\nChange-Id: Ifee7ab8485f9ce95cb4445bf0e893a1c54c48251\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9e43f59c89592a71f026e352404437281ea724a", "tree": "0314341f43bd721f5251559c264dab9b27734716", "parents": [ "ef8cae9e3a5ddf12d8a2e156c82691efe049c394", "400b9a56ee8e3ff4fab6ec8979043491e506e12d" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 23:15:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:15:53 2023 +0000" }, "message": "Merge \"Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\" into main am: 3065779a38 am: 518f979e5d am: 400b9a56ee\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492\n\nChange-Id: I9798237b03015d86f2523f14f583ad694d8ac3ec\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e85b64e0fc05921ecfe994098e1a3cc35863c621", "tree": "91a371db25bcfe7a9b6c61814d1c3b7c42c46660", "parents": [ "719febf831ae67f29adff9802063bc9a199a5aee", "21bbfb87548b04e5e02989a8743510b5619796e3" ], "author": { "name": "Mark Punzalan", "email": "markpun@google.com", "time": "Mon Nov 13 23:02:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:02:33 2023 +0000" }, "message": "Merge \"[aapt2] Parse --feature-flags parameter values\" into main am: 21bbfb8754\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813074\n\nChange-Id: Iaf2ce67ed91d09e587a8e367349d3510e25e72cf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3ded59672074c71ff30339e8383e01411076a263", "tree": "3e333021d3d1c0e2ea1c3f4d607b551832344a6b", "parents": [ "195230e096e59dc2e407c329ffacffd5d5c8adfa", "21bbfb87548b04e5e02989a8743510b5619796e3" ], "author": { "name": "Mark Punzalan", "email": "markpun@google.com", "time": "Mon Nov 13 23:02:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:02:28 2023 +0000" }, "message": "Merge \"[aapt2] Parse --feature-flags parameter values\" into main am: 21bbfb8754\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813074\n\nChange-Id: If9be16e1daadbdcc660ab39e469f0bfa3ca52e00\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "195230e096e59dc2e407c329ffacffd5d5c8adfa", "tree": "cee0e37d67077f121e35b358031c46ab56a4a453", "parents": [ "518f979e5d2d147f9a2302d420c95f39465dfb2c", "bc9d6797ec8942a229097eb1503cc96f39f81ec4" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Mon Nov 13 23:01:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:01:37 2023 +0000" }, "message": "Merge \"lint: update documentation on how to update the baseline\" into main am: bc9d6797ec\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815153\n\nChange-Id: I0ae0d5c191c0c2b0cd42ee996cb02a084c62d068\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "719febf831ae67f29adff9802063bc9a199a5aee", "tree": "4ee6883290c7ee7beeab8b5c5cafe12c2ed692c4", "parents": [ "608741d17c11c40fe9c196278db514d40e77fc78", "bc9d6797ec8942a229097eb1503cc96f39f81ec4" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Mon Nov 13 23:01:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 23:01:35 2023 +0000" }, "message": "Merge \"lint: update documentation on how to update the baseline\" into main am: bc9d6797ec\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815153\n\nChange-Id: I10936f3dedff84667188827f6d6ad54040160b22\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ef8cae9e3a5ddf12d8a2e156c82691efe049c394", "tree": "2c34597d74ac691bb5ff5c8077ab46ae97548822", "parents": [ "f5adf3e9ea9b1313d2fe74ca4828090931c8853a", "9d8f520bb77e30f7489dc3dee23dec93def1ec8d" ], "author": { "name": "Ale Nijamkin", "email": "nijamkin@google.com", "time": "Mon Nov 13 23:00:19 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 23:00:19 2023 +0000" }, "message": "Merge \"[flexiglass] Adds support for \"enhanced PIN privacy\"\" into main" }, { "commit": "21bbfb87548b04e5e02989a8743510b5619796e3", "tree": "00f2875c44a1e534cf8573e6fbbb3b8093d9accb", "parents": [ "bc9d6797ec8942a229097eb1503cc96f39f81ec4", "5579cadae55c55cae8b485fc9d94e38d8c474c77" ], "author": { "name": "Mark Punzalan", "email": "markpun@google.com", "time": "Mon Nov 13 22:52:27 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 13 22:52:27 2023 +0000" }, "message": "Merge \"[aapt2] Parse --feature-flags parameter values\" into main" }, { "commit": "32443e3266d0599a0f9a5e5fb50e1a55bb70dee4", "tree": "835e79d77bece77c5a892ec33cfb2080fc02e51c", "parents": [ "400b9a56ee8e3ff4fab6ec8979043491e506e12d", "608741d17c11c40fe9c196278db514d40e77fc78" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 22:46:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 22:46:16 2023 +0000" }, "message": "Merge \"Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\" into main am: 3065779a38 am: 608741d17c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492\n\nChange-Id: I99b877849d143b4b8ac82a13ed39867c76a1f233\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "400b9a56ee8e3ff4fab6ec8979043491e506e12d", "tree": "835e79d77bece77c5a892ec33cfb2080fc02e51c", "parents": [ "bfa1a4d9caaea323e3e66dfebbe8b036b0bc296d", "518f979e5d2d147f9a2302d420c95f39465dfb2c" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 22:44:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 22:44:06 2023 +0000" }, "message": "Merge \"Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\" into main am: 3065779a38 am: 518f979e5d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492\n\nChange-Id: I929d2801a41b397e66dc33dede5beb87385ef61b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bc9d6797ec8942a229097eb1503cc96f39f81ec4", "tree": "7e42a7c897509e35f3e8e91d4fe8f37359c1f767", "parents": [ "3065779a388c7dd5f29977e2024a17f1aa7f0143", "21a709f4f3182aee9be1469af45c16192cb50868" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Mon Nov 13 22:34:36 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 13 22:34:36 2023 +0000" }, "message": "Merge \"lint: update documentation on how to update the baseline\" into main" }, { "commit": "f5adf3e9ea9b1313d2fe74ca4828090931c8853a", "tree": "73d1654596366f27138b321233c71b9c5b5a9b02", "parents": [ "c79d8a7487e779fc1628b44082797e5bb4b0c18b", "bfa1a4d9caaea323e3e66dfebbe8b036b0bc296d" ], "author": { "name": "Nikhil Kumar", "email": "nykkumar@google.com", "time": "Mon Nov 13 22:27:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 22:27:46 2023 +0000" }, "message": "[automerger skipped] Merge \"Refactored switchUSer to handle user switch back to the current user\" into udc-qpr-dev am: 58e26a5780 am: bfa1a4d9ca -s ours\n\nam skip reason: Merged-In Ia40cfacbee6fc174c90db8e3687838ae01e2858b with SHA-1 46088e4f1a is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25327380\n\nChange-Id: I758bf4f63596288a6e332bf47b5ece8604e8d703\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fc9ba4aa6ed6a5559c79b7eec15fe943ce98dac1", "tree": "8a02b3d2f9ae7551c75cf1ba5122adb6c51c8095", "parents": [ "c79d8a7487e779fc1628b44082797e5bb4b0c18b" ], "author": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Mon Nov 13 22:00:33 2023 +0000" }, "committer": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Mon Nov 13 22:24:28 2023 +0000" }, "message": "New aconfig flag for coroutine tracing\n\nTest: atest SystemUI\nBug: 289353932\nFlag: ACONFIG com.android.systemui.coroutine_tracing DISABLED\nChange-Id: I78a9132489df5adf25de5d61f46945e581d8f5e8\n" }, { "commit": "c79d8a7487e779fc1628b44082797e5bb4b0c18b", "tree": "73d1654596366f27138b321233c71b9c5b5a9b02", "parents": [ "4eb430b7f29e5a64e3a35db1d9c1ea91d55aa01c", "b88af738615e45581a4be22553a4b4f30bf7da65" ], "author": { "name": "Thiébaud Weksteen", "email": "tweek@google.com", "time": "Mon Nov 13 22:18:24 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 22:18:24 2023 +0000" }, "message": "Merge \"Add permission annotation to DeviceStateManagerGlobalTest\" into main" }, { "commit": "518f979e5d2d147f9a2302d420c95f39465dfb2c", "tree": "17a550fa75ee160cde5b91fd0bfc74874197ad81", "parents": [ "1a6615193a08b5935a0be1cc447a3c435f8f7bff", "3065779a388c7dd5f29977e2024a17f1aa7f0143" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 22:12:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 22:12:49 2023 +0000" }, "message": "Merge \"Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\" into main am: 3065779a38\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492\n\nChange-Id: If539f8ad461b2ff8f6b8137cb6aca96940d7ccdc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "608741d17c11c40fe9c196278db514d40e77fc78", "tree": "61fb091aaa5dff33a16a01b3d03c8efd3250fe70", "parents": [ "761bbe3cf144599b6d6e5261a4559521347dc45d", "3065779a388c7dd5f29977e2024a17f1aa7f0143" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 22:12:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 22:12:36 2023 +0000" }, "message": "Merge \"Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\" into main am: 3065779a38\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492\n\nChange-Id: I4af6071b3d5dec52ab6eb011362b2103ae70b8a0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4eb430b7f29e5a64e3a35db1d9c1ea91d55aa01c", "tree": "690f3ade9bf60ae9e3cefea1a34da05b39b26e9f", "parents": [ "bad60b8d611bf7199f730a59c3119ebfabc1e794", "1ba67b492ed8d0a1a9a603696c13a39205a42347" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Mon Nov 13 21:58:49 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 21:58:49 2023 +0000" }, "message": "Merge \"Add data layer for the DeviceEntryIcon\" into main" }, { "commit": "bfa1a4d9caaea323e3e66dfebbe8b036b0bc296d", "tree": "66fa9fd7de0a389a1c9925cf558407971e6ac601", "parents": [ "ebc3911904931a4ff20d302164a8a20797c76ae4", "58e26a57800a40de88b2574102abc2908a226243" ], "author": { "name": "Nikhil Kumar", "email": "nykkumar@google.com", "time": "Mon Nov 13 21:55:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 21:55:21 2023 +0000" }, "message": "Merge \"Refactored switchUSer to handle user switch back to the current user\" into udc-qpr-dev am: 58e26a5780\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25327380\n\nChange-Id: I769dd0f0300f1048d4ee3911df898a7f98a138ce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bad60b8d611bf7199f730a59c3119ebfabc1e794", "tree": "399c6b0055a3c2b75a3d991e716f4b861edd4c2e", "parents": [ "9ef8c1f703faba4b1976e75709ccfea801886a01", "8505f344ee40c04b55ed129afc58c657a98b2616" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Nov 13 21:49:04 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 21:49:04 2023 +0000" }, "message": "Merge \"Fix clip calculation for disabled clip bounds\" into main" }, { "commit": "9ef8c1f703faba4b1976e75709ccfea801886a01", "tree": "40aae9cc94dc1479355c863c292de0aa1408b2e0", "parents": [ "0758ffb5c66fd8ab122981863a828013cd350d9a", "5909d0ff6c294ecbcac6f06121db4c3fbe563df7" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Nov 13 21:42:26 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 21:42:26 2023 +0000" }, "message": "Merge \"Camera: Update API docs\" into main" }, { "commit": "3065779a388c7dd5f29977e2024a17f1aa7f0143", "tree": "481b0afb0a5dbbaf0fafe41d7e5bbd50b7964cd2", "parents": [ "663e2aaa56db7452b0c97b652386f7deb069ebce", "86504f74d9e4fafd511c6d7b065a3971d083e189" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 21:38:55 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 13 21:38:55 2023 +0000" }, "message": "Merge \"Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\" into main" }, { "commit": "0234597bdfa9386a493cfd39da3f61c2e5a0ba09", "tree": "da0671cd0b440f621dd6b666f9022e1fd9cb948b", "parents": [ "1b433c6a3cbf660bec657d1aa358d90541ed1bb4" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Wed Nov 08 15:20:15 2023 -0500" }, "committer": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Nov 13 16:32:07 2023 -0500" }, "message": "Prevent desync of NICViewBinder + NotifCollection\n\nThere is a potential race condition where the NotifCollection removes a\nnotification before the NICViewBinder attempts to bind its icon. In this\nstate, the NICViewBinder believes that the icon should be present, but\nin reality the icon is about to be removed by the next pipeline run.\n\nThe fix tracks icons that \"fail\" to bind in this way. The expectation is\nthat this tracking is ephemeral, and will be cleared by the next update\nfrom the ViewModel, after the pipeline has run again. This tracking is\ndumped in a bug report to identify situations where there are repeated\nfailures to bind, indicating a more significant logic issue.\n\nFlag: ACONFIG com.android.systemui.notifications_icon_container_refactor DEVELOPMENT\nFixes: 309555139\nBug: 278765923\nTest: manual - repeatedly unplug and replug the phone into USB\n debugging, observe no crash.\nChange-Id: I49e5cf068bf5156a2d6df6a6870d062a773d9ff5\n" }, { "commit": "e9558bae5d4f6c4ca02d76a9bd53f1c66ce50ca5", "tree": "05efa3ddfecd48ea35c5758b0d402ef40a8be73c", "parents": [ "0758ffb5c66fd8ab122981863a828013cd350d9a" ], "author": { "name": "Shilpa Satish", "email": "shilpasatish@google.com", "time": "Wed Oct 04 18:10:37 2023 +0000" }, "committer": { "name": "Shilpa Satish", "email": "shilpasatish@google.com", "time": "Mon Nov 13 21:16:25 2023 +0000" }, "message": "Adding CONNECTIVITY_KEEP_DATA_ON to handle Safety Situation\n\nBug: 302057004\nTest: Manual | Units Tests\n\nChange-Id: I2228a8f91e716ea33e081577ba522ea7023898e6\n" }, { "commit": "58e26a57800a40de88b2574102abc2908a226243", "tree": "cc1bdddb09a3f8a164d7268f3372bae52d5f85e7", "parents": [ "9f556ea7d0605a0e5f3c330ef63fe02a0eb47129", "1e3d4f48ab24593ec401ccbc968efbc0a82fea40" ], "author": { "name": "Nikhil Kumar", "email": "nykkumar@google.com", "time": "Mon Nov 13 21:12:18 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 21:12:18 2023 +0000" }, "message": "Merge \"Refactored switchUSer to handle user switch back to the current user\" into udc-qpr-dev" }, { "commit": "0758ffb5c66fd8ab122981863a828013cd350d9a", "tree": "c3e2895e13ebf4f6e725352a896af3749feba1f8", "parents": [ "fdf07d8540f796cabe6310d9582e9047efc5a549", "f54d617efc84bffdb1df8e6fe7641522898965b1" ], "author": { "name": "Brad Lassey", "email": "lassey@google.com", "time": "Mon Nov 13 20:51:12 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 20:51:12 2023 +0000" }, "message": "Merge \"Implementing support for NFC observe mode, polling loop fingerprints and field strength along with their associated APIs.\" into main" }, { "commit": "86504f74d9e4fafd511c6d7b065a3971d083e189", "tree": "41cbf643946baee667a58d1074d2eb68d2102bd8", "parents": [ "c83ec7169da1efb5d9d47f564da372ee710b64ce" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Mon Nov 13 20:46:56 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 13 20:46:56 2023 +0000" }, "message": "Revert \"Add google-owned SMS short codes for Namibia, United Arab Emirates\"\n\nThis reverts commit c83ec7169da1efb5d9d47f564da372ee710b64ce.\n\nReason for revert: b/309999062 | testSmsShortCodeDestination failing\n\nChange-Id: I98b18677f6330e6d1fb52bc3cdfec7c4a4418b57\n" }, { "commit": "fdf07d8540f796cabe6310d9582e9047efc5a549", "tree": "77b1fa24062a2fad5f4e002c89d1a923bf12d387", "parents": [ "7b73fd94f7486f16c1a62705618205188c5a0abe", "88ea9ba9dc9317adb543cbc0748444a906820ad7" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Mon Nov 13 20:29:11 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 20:29:11 2023 +0000" }, "message": "Merge \"Ravenwood: Add device test to RavenwoodMockitoTest\" into main" }, { "commit": "7b73fd94f7486f16c1a62705618205188c5a0abe", "tree": "733e16e2c412840ac0ffc7dd77b03efa6e94bf46", "parents": [ "8869d6ef95e2519a152c90a4ad661e8c36a08938", "ebc3911904931a4ff20d302164a8a20797c76ae4" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Mon Nov 13 20:26:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 20:26:43 2023 +0000" }, "message": "Merge \"Ensure inner classes of @SystemApi classes are kept\" into main am: 663e2aaa56 am: 761bbe3cf1 am: ebc3911904\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817021\n\nChange-Id: I626f698f800be7f34fcf5201b517940726896b26\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8869d6ef95e2519a152c90a4ad661e8c36a08938", "tree": "733e16e2c412840ac0ffc7dd77b03efa6e94bf46", "parents": [ "c85389368ac0f8639977fa0f9acb7b935c8daa9f", "f2dfb0ac6605db93b5773c76baada74e76d21ed2" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 20:17:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 20:17:45 2023 +0000" }, "message": "[automerger skipped] Merge \"core: Move FastXmlSerializer to module utils\" into main am: 58ccf443eb -s ours am: 6637e0b1e4 -s ours am: f2dfb0ac66 -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: Id677613c538c0c116e65d8d8f10f30fc16c7cb8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c85389368ac0f8639977fa0f9acb7b935c8daa9f", "tree": "733e16e2c412840ac0ffc7dd77b03efa6e94bf46", "parents": [ "d9fc9f33ab7ecbae577562b1ae67f7da0e1742d7", "e4648a7d0644167cb54a130aed0a23276005fe25" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 20:17:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 20:17:21 2023 +0000" }, "message": "[automerger skipped] core: Move FastXmlSerializer to module utils am: 3101a1134c -s ours am: 2ea669e069 -s ours am: e4648a7d06 -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: I442c490da0f51ed6499f8a341c4bd50d53635a45\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d9fc9f33ab7ecbae577562b1ae67f7da0e1742d7", "tree": "733e16e2c412840ac0ffc7dd77b03efa6e94bf46", "parents": [ "0cf6e4c84414e64df2bae0f4a2cbaae994349c1d", "6844d5cecd24e451c1a802a4943407492dfb1bb5" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Mon Nov 13 20:16:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 20:16:34 2023 +0000" }, "message": "Merge \"Ensure inner classes of @SystemApi classes are kept\" into main am: 663e2aaa56 am: 1a6615193a am: 6844d5cecd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817021\n\nChange-Id: I967b4fd087daa6ade2423bd779314a00223f5d55\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0cf6e4c84414e64df2bae0f4a2cbaae994349c1d", "tree": "0765d075790529b5ad69393b71b32c0035bbe4df", "parents": [ "f2e3a23e4fbac507d351206926c968741c5ed05a", "86eef4bef117708e5ff22d266b535fa00d4da62e" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 20:13:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 20:13:12 2023 +0000" }, "message": "[automerger skipped] Merge \"core: Move FastXmlSerializer to module utils\" into main am: 58ccf443eb am: 486b2f67f4 -s ours am: 86eef4bef1 -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: I5c13259c756a038b906d561bb2bb0c60a85f24c4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2e3a23e4fbac507d351206926c968741c5ed05a", "tree": "0765d075790529b5ad69393b71b32c0035bbe4df", "parents": [ "b9977e5f12602d8080ff1e8eb8c1094ba21e8d7e", "0e8ec93e8cc65bdfd5c91b029da1f4d0e65cb693" ], "author": { "name": "Jiaming Liu", "email": "jiamingliu@google.com", "time": "Mon Nov 13 20:08:59 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 20:08:59 2023 +0000" }, "message": "Merge \"Add Trunk Flag for Interactive Divider\" into main" }, { "commit": "ebc3911904931a4ff20d302164a8a20797c76ae4", "tree": "d7c9494d6a6f705fc2d8f9865019fcec2c9acfae", "parents": [ "f2dfb0ac6605db93b5773c76baada74e76d21ed2", "761bbe3cf144599b6d6e5261a4559521347dc45d" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Mon Nov 13 19:50:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:50:17 2023 +0000" }, "message": "Merge \"Ensure inner classes of @SystemApi classes are kept\" into main am: 663e2aaa56 am: 761bbe3cf1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817021\n\nChange-Id: I45b0726554c1e05a0ee43674a4999c2e2ad0c584\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2dfb0ac6605db93b5773c76baada74e76d21ed2", "tree": "d7c9494d6a6f705fc2d8f9865019fcec2c9acfae", "parents": [ "e4648a7d0644167cb54a130aed0a23276005fe25", "6637e0b1e4675593ec5ad9999afadca12e531431" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 19:49:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:49:13 2023 +0000" }, "message": "[automerger skipped] Merge \"core: Move FastXmlSerializer to module utils\" into main am: 58ccf443eb -s ours am: 6637e0b1e4 -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: I5c6424a28fc3c9183e3e7ec6b620920fe42c34c0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e4648a7d0644167cb54a130aed0a23276005fe25", "tree": "d7c9494d6a6f705fc2d8f9865019fcec2c9acfae", "parents": [ "6844d5cecd24e451c1a802a4943407492dfb1bb5", "2ea669e0691cea58baa57d5b8bfbd3a5c336dcac" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 19:48:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:48:49 2023 +0000" }, "message": "[automerger skipped] core: Move FastXmlSerializer to module utils am: 3101a1134c -s ours am: 2ea669e069 -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: I7044562828a23ef18088867716c96ab2af543003\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "531e139d19c68d980f25f8cac277317d0cabb1ce", "tree": "2bd2f0fb435fdd535ac6f6b2b72fcab8339e9cbc", "parents": [ "9f556ea7d0605a0e5f3c330ef63fe02a0eb47129" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Nov 13 11:42:45 2023 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Nov 13 11:42:45 2023 -0800" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I0be0f82ba4c1434aa1e8ae49dc27dc1e9a0aa469\n" }, { "commit": "b9977e5f12602d8080ff1e8eb8c1094ba21e8d7e", "tree": "d6b61b5f574c23a0aaddcf87e2cf77f46a839df8", "parents": [ "d0581d52a62d609f9d39f870d9211e3a97497de4", "16132eb7a644f99cb21dd5ecc7f961d772035ffe" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Mon Nov 13 19:39:28 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 19:39:28 2023 +0000" }, "message": "Merge \"Test QSTileViewModelImpl\" into main" }, { "commit": "8505f344ee40c04b55ed129afc58c657a98b2616", "tree": "d05a0bdc954b0eb480d9ae68c2ad239e76e451c0", "parents": [ "c64add5fbce5a1211b77d0cc7cc2e3969f402f03" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Nov 13 14:24:35 2023 -0500" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Nov 13 14:38:45 2023 -0500" }, "message": "Fix clip calculation for disabled clip bounds\n\nFixes: 309635621\nTest: atest android.uirendering.cts.testclasses.SurfaceViewTests\nChange-Id: Ie38c491c5a87f19b5352774164187e713bdf5849\n" }, { "commit": "1b433c6a3cbf660bec657d1aa358d90541ed1bb4", "tree": "98d695d83b40429c61b819ac254c0c0e74b788fe", "parents": [ "5df1df82bef09303440d8facf47f9f09f4c876b2" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Tue Nov 07 17:26:35 2023 -0500" }, "committer": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Nov 13 14:37:40 2023 -0500" }, "message": "Fix heads up isolated notif icon race condition\n\nIf the HeadsUpAppearanceController reported that there is an isolated\nnotification icon *before* the heads up StatusBarIconView is inflated by\nthe NotifPipeline, then the isolated icon would fail to show.\n\nThis is fixed by combining both the renderList and isolatedIcon states,\nas opposed to sampling the former when the latter changes.\n\nFlag: ACONFIG com.android.systemui.notifications_icon_container_refactor DEVELOPMENT\nBug: 278765923\nTest: atest SystemUITests\nChange-Id: If4897d973bfa301fe65ba9428289b3b4e0bb8685\n" }, { "commit": "6844d5cecd24e451c1a802a4943407492dfb1bb5", "tree": "d7c9494d6a6f705fc2d8f9865019fcec2c9acfae", "parents": [ "86eef4bef117708e5ff22d266b535fa00d4da62e", "1a6615193a08b5935a0be1cc447a3c435f8f7bff" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Mon Nov 13 19:34:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:34:22 2023 +0000" }, "message": "Merge \"Ensure inner classes of @SystemApi classes are kept\" into main am: 663e2aaa56 am: 1a6615193a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817021\n\nChange-Id: I29f9f8d376237eea4a2d348bb10df0b5fdb9da06\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "86eef4bef117708e5ff22d266b535fa00d4da62e", "tree": "5b7beff31faf243632ba39612d2b8f5e4fdbe29e", "parents": [ "33dfca57a8ff1791cfbbd1f1100f673eb7abeebb", "486b2f67f4d7cbe79f80abed01fd878e100b733a" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 19:32:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:32:13 2023 +0000" }, "message": "[automerger skipped] Merge \"core: Move FastXmlSerializer to module utils\" into main am: 58ccf443eb am: 486b2f67f4 -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: I851f0744a5ecc085ce6a7772fe4314ad9557428e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "761bbe3cf144599b6d6e5261a4559521347dc45d", "tree": "4c5de32482cb8a649f95faa591f6e735a8fa37f7", "parents": [ "6637e0b1e4675593ec5ad9999afadca12e531431", "663e2aaa56db7452b0c97b652386f7deb069ebce" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Mon Nov 13 19:20:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:20:39 2023 +0000" }, "message": "Merge \"Ensure inner classes of @SystemApi classes are kept\" into main am: 663e2aaa56\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817021\n\nChange-Id: I5f190e3c41530ec792bfc65c92d4623f21c5a05b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6637e0b1e4675593ec5ad9999afadca12e531431", "tree": "e14d2a9d67ecbd6c3cdd280057afc3ae3be1ab97", "parents": [ "2ea669e0691cea58baa57d5b8bfbd3a5c336dcac", "58ccf443eb7d8cf263c6bd51875264866cf72d37" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 19:16:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:16:58 2023 +0000" }, "message": "[automerger skipped] Merge \"core: Move FastXmlSerializer to module utils\" into main am: 58ccf443eb -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: Id4bf663d5c5607ff9ed4a64e6ceedfa491428b09\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2ea669e0691cea58baa57d5b8bfbd3a5c336dcac", "tree": "e14d2a9d67ecbd6c3cdd280057afc3ae3be1ab97", "parents": [ "525720bf5af2a7a05d2852f8961d81555a55eb7c", "3101a1134c91486f696e66dd80a92de52f9e3d13" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 19:16:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:16:37 2023 +0000" }, "message": "[automerger skipped] core: Move FastXmlSerializer to module utils am: 3101a1134c -s ours\n\nam skip reason: Merged-In Ifabc201418c54c2f910ff4b95b5240a58a683001 with SHA-1 589f310893 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: I51d1687c6e55dc40edb8191a8658838592ec07b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1ba67b492ed8d0a1a9a603696c13a39205a42347", "tree": "edbd0b7798467fbde7e1b62532be842c52321684", "parents": [ "71f141800ea6c74f6098efd59bba97b43342116c" ], "author": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Wed Oct 25 18:40:35 2023 +0000" }, "committer": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Mon Nov 13 19:13:50 2023 +0000" }, "message": "Add data layer for the DeviceEntryIcon\n\nAdds support for:\n - AOD burnInOffsets\n - Current device entry state (locked/unlocked/listening for udfps)\n - Alpha changes based on transitions (except for AlternateBouncer)\n and shade/bouncer expansion\n\nDoes not yet handle:\n - UDFPS transition between AOD \u003c\u003d\u003e LS (motion is missing)\n - AlternateBouncer UI, including alternate bouncer transitions\n - Sending UDFPS state to FingerprintManager\n - AuthRipple animation playing on icon longpress (if unlocked \u0026 udfps\n supported)\n\nRemoves two \u003c\u003eTransitionViewModelTests from the robo tests config\ntemporarily.\n\nFlag: LEGACY REFACTOR_UDFPS_KEYGUARD_VIEWS DISABLED\nTest: atest DeviceEntryUdfpsInteractorTest DeviceEntryStatusInteractorTest\nTest: atest AodToGoneTransitionViewModelTest AodToLockscreenTransitionViewModelTest AodToOccludedTransitionViewModelTest DozingToLockscreenTransitionViewModelTest DreamingToLockscreenTransitionViewModelTest GoneToAodTransitionViewModelTest LockscreenToAodTransitionViewModelTest LockscreenToDreamingTransitionViewModelTest LockscreenToGoneTransitionViewModelTest LockscreenToOccludedTransitionViewModelTest LockscreenToPrimaryBouncerTransitionViewModelTest OccludedToLockscreenTransitionViewModelTest OccludedToAodTransitionViewModelTest PrimaryBouncerToAodTransitionViewModelTest PrimaryBouncerToLockscreenTransitionViewModelTest\nBug: 305234447\n\nChange-Id: I2489562301e565c1dd7843a34fcfaa7db6e18c3a\n" }, { "commit": "269b9864464e898e0b44853f63f78598dd1f8ec4", "tree": "081ac4e3f1791e6279961f97069a4a33d75769aa", "parents": [ "9f556ea7d0605a0e5f3c330ef63fe02a0eb47129" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Nov 13 11:08:52 2023 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Nov 13 11:08:52 2023 -0800" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ifbbbb4cf41d047fc74a85641153960c6aca3bc2f\n" }, { "commit": "1a6615193a08b5935a0be1cc447a3c435f8f7bff", "tree": "3bcfc868099e27200d6c25c0f0bcea735b09489f", "parents": [ "486b2f67f4d7cbe79f80abed01fd878e100b733a", "663e2aaa56db7452b0c97b652386f7deb069ebce" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Mon Nov 13 19:06:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:06:28 2023 +0000" }, "message": "Merge \"Ensure inner classes of @SystemApi classes are kept\" into main am: 663e2aaa56\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817021\n\nChange-Id: Ia06b4166a89f7a0b7227340d5f8eb8e3d52d1154\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "486b2f67f4d7cbe79f80abed01fd878e100b733a", "tree": "458954a23e35802148f32789a1fd2f6fedc6d321", "parents": [ "c8b781d140661dee728481ff4543aa232717c919", "58ccf443eb7d8cf263c6bd51875264866cf72d37" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 13 19:00:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 13 19:00:38 2023 +0000" }, "message": "Merge \"core: Move FastXmlSerializer to module utils\" into main am: 58ccf443eb\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2816009\n\nChange-Id: I2cf41dbbcbed579243f68effeb8dff012d85539b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d0581d52a62d609f9d39f870d9211e3a97497de4", "tree": "82669644c328ae216f3e2232d7a1f23645266525", "parents": [ "cf4d8a37592c3f399197bdbccdf9890e1f77355c", "9eeed8cfc74ff0ebbb983f209962fb3fcdefce54" ], "author": { "name": "David Zhao", "email": "qingxun@google.com", "time": "Mon Nov 13 18:58:34 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 18:58:34 2023 +0000" }, "message": "Merge \"CSAI: add ad framework components (part 1)\" into main" }, { "commit": "cf4d8a37592c3f399197bdbccdf9890e1f77355c", "tree": "4ca213ce05f80961dc89f862cc322faea137c6d4", "parents": [ "71f141800ea6c74f6098efd59bba97b43342116c", "32dbc8964a49fa849223b5492914317890b72c89" ], "author": { "name": "Juan Sebastian Martinez", "email": "juansmartinez@google.com", "time": "Mon Nov 13 18:44:35 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 18:44:35 2023 +0000" }, "message": "Merge \"Revert \"Using View.performHapticFeedback on Volume Dialog Impl when the silent and vibrate-only icons are pressed\"\" into main" }, { "commit": "88ea9ba9dc9317adb543cbc0748444a906820ad7", "tree": "8f4bfb05b4c6890c15617085983afafac11d9e54", "parents": [ "2488dbeebf247fd29f37d91930a3b5ba25be8fc9" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Mon Nov 13 10:03:07 2023 -0800" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Mon Nov 13 10:42:14 2023 -0800" }, "message": "Ravenwood: Add device test to RavenwoodMockitoTest\n\nTest: atest RavenwoodMockitoTest RavenwoodMockitoTest_device\nBug: 310268946\nBug: 292141694\nChange-Id: Iaf0f689d5513a1a4dce4d756aad2152202d72e6d\n" }, { "commit": "9d8f520bb77e30f7489dc3dee23dec93def1ec8d", "tree": "9b6febf7c3abb719b420a9e462750ae65a2ca0c7", "parents": [ "71f141800ea6c74f6098efd59bba97b43342116c" ], "author": { "name": "Alejandro Nijamkin", "email": "nijamkin@google.com", "time": "Mon Nov 13 10:11:28 2023 -0800" }, "committer": { "name": "Ale Nijamkin", "email": "nijamkin@google.com", "time": "Mon Nov 13 18:39:54 2023 +0000" }, "message": "[flexiglass] Adds support for \"enhanced PIN privacy\"\n\nFix: 308977777\nTest: unit tests added for repository and view-model\nTest: manully verified with the setting on and off that the digit\nbuttons on the PIN bouncer don\u0027t and do animate when touched,\nrespectively\nTest: manually verified that the setting value has no bearing on whether\nthe non-digit buttons (delete and enter) are animated when touched: they\nalways animate\nFlag: ACONFIG com.android.systemui.scene_container DEVELOPMENT\n\nChange-Id: Idf116b27ccd590a3f57bf6b6c35933ae2e3075d6\n" }, { "commit": "71f141800ea6c74f6098efd59bba97b43342116c", "tree": "4a77a9ac9fdcd47a30e3a62e53ee289c81c771fc", "parents": [ "0d508ca7f4b0d021102710ab1db98ec845200489", "34c3ed3e58494545be85938afa1ee9d2abd7fd45" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 13 18:35:05 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 18:35:05 2023 +0000" }, "message": "Merge \"[flexiglass] Addresses a couple of comments in BouncerScene.\" into main" }, { "commit": "0d508ca7f4b0d021102710ab1db98ec845200489", "tree": "53b8ee785d3cfdb2dc676aa2e7ad57b0d0649028", "parents": [ "be10ee5a41e3a05f516ab28ab635a42ebdf136b1", "46faf2008f7e5e81367bb57bfb2590877536ffff" ], "author": { "name": "William Xiao", "email": "wxyz@google.com", "time": "Mon Nov 13 18:30:18 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 18:30:18 2023 +0000" }, "message": "Merge \"Address follow-up comments for UMO in hub mode\" into main" }, { "commit": "be10ee5a41e3a05f516ab28ab635a42ebdf136b1", "tree": "eada6d07e25b85ca27850672f22785d3a6f1f122", "parents": [ "a0165f578ba5149a83e9faf5ae82307073c9f395", "e60d5c87954bb10c3f6a6013f07a0878ed72f5a7" ], "author": { "name": "Xiaowen Lei", "email": "xilei@google.com", "time": "Mon Nov 13 18:24:29 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 13 18:24:29 2023 +0000" }, "message": "Merge \"Remove released flag SMARTSPACE_DATE_WEATHER_DECOUPLED and its use sites.\" into main" } ], "next": "a0165f578ba5149a83e9faf5ae82307073c9f395" }