)]}' { "log": [ { "commit": "c4c9ace9656e651c60fc4fa43ad4dae6b5340d73", "tree": "e0419e747e8eb98c1b206c1eae096d8cb26dc8a7", "parents": [ "9a54da6d233969d8c6ca67a73cd45dddd1693fa8" ], "author": { "name": "Rupesh Bansal", "email": "brup@google.com", "time": "Thu Sep 22 10:45:48 2022 +0000" }, "committer": { "name": "Rupesh Bansal", "email": "brup@google.com", "time": "Thu Sep 22 11:00:50 2022 +0000" }, "message": "Fix failing BrightnessMappingStrategyTest\n\nWe recently ported the ambient light to screen brightness in nits\nmapping to the display-device configi to make them display specific. During that, we broke the tests\nfor BrightnessMappingStrategyTest.\n\nBug: 248045938\nTest: atest BrightnessMappingStrategyTest\nChange-Id: I5941f84a95f07bd4b48070ba9361c2e437978971\n" }, { "commit": "9a54da6d233969d8c6ca67a73cd45dddd1693fa8", "tree": "378b383ab5281dff853a5b1303e53a8bc19c2197", "parents": [ "fa561d39347c7b392065b8c9a031d8b2d6726d27", "87c0106ea7ef8736aba9fd367cdd4b5558d34fec" ], "author": { "name": "Wu Ahan", "email": "ahanwu@google.com", "time": "Tue Sep 20 13:11:48 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 13:11:48 2022 +0000" }, "message": "Merge \"DO NOT MERGE: Enable presubmit for com.android.internal.jank\" into tm-qpr-dev" }, { "commit": "fa561d39347c7b392065b8c9a031d8b2d6726d27", "tree": "d5af4221a0981445966c4f90ecdb720b4cd7baaf", "parents": [ "668090c09b0a23e9dca94cd48ebb88e4e2c58edc", "54a7b623b1a165b085bd74358268636675453bad" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Tue Sep 20 12:34:44 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 12:34:44 2022 +0000" }, "message": "Merge \"Do not use stableDisplaySize for scale factor\" into tm-qpr-dev" }, { "commit": "668090c09b0a23e9dca94cd48ebb88e4e2c58edc", "tree": "57dd3bcc2620368b89f6835a8207d82fad7322da", "parents": [ "d5d35fb282d5b8cefebeb2c51fc164faf5590e1c", "7d7d64032e7844aa526b668b3b49ea0d3a2110a4" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Tue Sep 20 12:34:29 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 12:34:29 2022 +0000" }, "message": "Merge \"Update FP sensor location before showing dwellAnim\" into tm-qpr-dev" }, { "commit": "d5d35fb282d5b8cefebeb2c51fc164faf5590e1c", "tree": "ef7dafae636b603c6e953a05b0e05586d3c99429", "parents": [ "03ef589f1d05581805303237dde734ad743c2649", "1c1f58ca75f648c6c7c06ebdd354183881425ea4" ], "author": { "name": "Chandru S", "email": "chandruis@google.com", "time": "Tue Sep 20 06:36:58 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 06:36:58 2022 +0000" }, "message": "Merge \"Cleans up any stray instances of KeyguardUpdateMonitor that might still have listeners attached to system services.\" into tm-qpr-dev" }, { "commit": "03ef589f1d05581805303237dde734ad743c2649", "tree": "4241f7daebac002a48f15075bcf2a525ffd3d854", "parents": [ "95ffd81e8f78a9e881aec335e1ba5aa7f34ed696", "ac1bbfef631f238a280652d6bf21cb8ed36fd77f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 20 06:29:53 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 06:29:53 2022 +0000" }, "message": "Merge \"Add test size to TakeScreenshotServiceTest\" into tm-qpr-dev" }, { "commit": "95ffd81e8f78a9e881aec335e1ba5aa7f34ed696", "tree": "c34032349f75694cc5c35873b9712a2a27956119", "parents": [ "1c2c0b52584895d4999ff7a47eeea89ced8fd2ca", "eaa0fd59f06e810bf26bda14bdd06623b1ec68b3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 20 05:03:54 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 05:03:54 2022 +0000" }, "message": "Merge \"Allow bugreport only after server-side config loaded\" into tm-qpr-dev" }, { "commit": "1c2c0b52584895d4999ff7a47eeea89ced8fd2ca", "tree": "2623abe823b28f2f59e16cec332d2c5e1595df9a", "parents": [ "2dbb6cb42183dfd4ff64d3c10e800e513fc215a2", "15bbf37379e3dcd3dfac61c222506e03975cce46" ], "author": { "name": "Tony Huang", "email": "tonyychuang@google.com", "time": "Tue Sep 20 03:12:05 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 03:12:05 2022 +0000" }, "message": "Merge \"Reduce flicker when split pair switching\" into tm-qpr-dev" }, { "commit": "2dbb6cb42183dfd4ff64d3c10e800e513fc215a2", "tree": "3a6b318ce086092372b7861488969ba73b248cb2", "parents": [ "3507c76df092f81bfb08dadd6aa96c4a433f2bbe", "6f8675f324ca9442b8c025cc3fb2c85b662d4bde" ], "author": { "name": "Hyosun Kim", "email": "hyosunkim@google.com", "time": "Tue Sep 20 03:06:34 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 03:06:34 2022 +0000" }, "message": "Merge \"To read the group UUID, the calling app either needs carrier privileges or the READ_PHONE_STATE permission and access to device identifiers.\" into tm-qpr-dev" }, { "commit": "3507c76df092f81bfb08dadd6aa96c4a433f2bbe", "tree": "46b07ab3eb911a1ab4522e30702f91694784e272", "parents": [ "bff2fa5fd8fa6938cd530382865a053795a14dde", "9ab47fa93ed9751e10fbc0d4f2f2d40360e39f42" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Tue Sep 20 02:57:27 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 02:57:27 2022 +0000" }, "message": "Merge \"Added QS Screen Record Animated Icons\" into tm-qpr-dev" }, { "commit": "bff2fa5fd8fa6938cd530382865a053795a14dde", "tree": "499076214986f214e7a7d350902fd50c86648bae", "parents": [ "d7e17f97c77e7b7e0943eaad2f208ca07d860d6c", "0a234cf41cf04d4516d94ece49ff7a4f9a255ee7" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Tue Sep 20 00:41:49 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 00:41:49 2022 +0000" }, "message": "Merge \"Updated QS Airplane Mode Icons\" into tm-qpr-dev" }, { "commit": "d7e17f97c77e7b7e0943eaad2f208ca07d860d6c", "tree": "1ae55fed413322581910054ae4c65a5d9c689727", "parents": [ "1d5c1dd93b0e90d48ca8ad30c2a4750fbc8e75fb", "09c0d6ef9e977bd07d92446556972ad0f7158a72" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 20 00:09:19 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 00:09:19 2022 +0000" }, "message": "Merge \"Allow background activity launch by drag notification\" into tm-qpr-dev" }, { "commit": "1d5c1dd93b0e90d48ca8ad30c2a4750fbc8e75fb", "tree": "d7b6b374ce02b372535f89e73af15542919f3abc", "parents": [ "1ecaa4d68e6745ceb8cdd5ef94e639fb1b1d2909", "9e5ed96062d245350d4a1d8a3e271f32175f2994" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Tue Sep 20 00:08:59 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 00:08:59 2022 +0000" }, "message": "Merge \"New QS Flashlight Tile Animated Icons\" into tm-qpr-dev" }, { "commit": "1ecaa4d68e6745ceb8cdd5ef94e639fb1b1d2909", "tree": "c13c00df13fa273ecdb0f90cc1f092e1dea362d2", "parents": [ "43ae247466674a050ba85901dc031ae72afe35ef", "6eda3a1d1a48f31591314185a814e54335f84098" ], "author": { "name": "Ilya Matyukhin", "email": "ilyamaty@google.com", "time": "Mon Sep 19 23:50:27 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 23:50:27 2022 +0000" }, "message": "Merge \"Refactor UDFPS display logic and remove illumination\" into tm-qpr-dev" }, { "commit": "43ae247466674a050ba85901dc031ae72afe35ef", "tree": "b2b5222a119584af724f36440021098f30c9a64b", "parents": [ "ea127ffb59fbeb49a8dc44d717c74d53ab60569c", "3f6eaacb35082e45d4315cbce6db7115da51f729" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 22:09:03 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 22:09:03 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: Ib1141719772ffd91c12d3e3f3bf20c1b3a41a760\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ea127ffb59fbeb49a8dc44d717c74d53ab60569c", "tree": "b2b5222a119584af724f36440021098f30c9a64b", "parents": [ "86b114ee53fe413685044120d3bbcbb14bdc23de", "d5d9652c4e8e7c3a7608bd1748e5fa87bac798bd" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 22:08:45 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 22:08:45 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: I944e505d87b6f1ef2358fedd607935197bbbcc68\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "86b114ee53fe413685044120d3bbcbb14bdc23de", "tree": "c8f032a53d9ced07f139dbc4d91881e27326f5e5", "parents": [ "78a37122666f4e00cf59c67a9dd2d723a1e65ea8", "10c40702d8fa5eeaa2d7a4a5c27424a1089adee6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 22:08:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 22:08:02 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I76967e68be39dab20bad92c12173029ffa799b95\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "78a37122666f4e00cf59c67a9dd2d723a1e65ea8", "tree": "c8f032a53d9ced07f139dbc4d91881e27326f5e5", "parents": [ "6118cfd13f01d9467ed7439ada0ce9e3f9afd2b0", "cf19e19498a110654dd495727e8ecb1690b02f33" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 22:07:09 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 22:07:09 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: Ie443d4880bd4489352b65b277de0c25cdb1bc18d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f6eaacb35082e45d4315cbce6db7115da51f729", "tree": "e7ae81bfc92ec0d41da870e53a9eb0b89fbe94b0", "parents": [ "d5d9652c4e8e7c3a7608bd1748e5fa87bac798bd", "0d99f586388369ee239547e6e60f30035a29baf5" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 21:40:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:40:00 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: Ic703f6ed01abc54ff3de8cab36a11d6f98997846\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d5d9652c4e8e7c3a7608bd1748e5fa87bac798bd", "tree": "e7ae81bfc92ec0d41da870e53a9eb0b89fbe94b0", "parents": [ "10c40702d8fa5eeaa2d7a4a5c27424a1089adee6", "ef85e63542ae96570165870a0bae445de1b5ab87" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 21:39:41 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:39:41 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: Idddebc27df2994bab6b8ea14ddff2dacadd6d7d2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "10c40702d8fa5eeaa2d7a4a5c27424a1089adee6", "tree": "23f7d79a832f149ee298aaaae3674d99d72910bf", "parents": [ "cf19e19498a110654dd495727e8ecb1690b02f33", "e8b730b5527a39713c21783e385afe8ef4eeef59" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 21:39:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:39:15 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I88a54a800b671af025c98b14b9016f0b95d0af55\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cf19e19498a110654dd495727e8ecb1690b02f33", "tree": "23f7d79a832f149ee298aaaae3674d99d72910bf", "parents": [ "65091e4cac5096fa392ebd3b2d775253bbe5beb6", "aebe4548c2a14ba744abf13b2f5f9d652f682e16" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 21:38:51 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:38:51 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: Idee945414daa7ab0de397e6af369c8775801a9bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6118cfd13f01d9467ed7439ada0ce9e3f9afd2b0", "tree": "c8f032a53d9ced07f139dbc4d91881e27326f5e5", "parents": [ "3493f307ba6045431edb32e41954d2633d704cd7", "1e52fddd4b6f7d37dc32f34780206a3139f68fba" ], "author": { "name": "Matt Casey", "email": "mrcasey@google.com", "time": "Mon Sep 19 21:22:48 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 21:22:48 2022 +0000" }, "message": "Merge \"Fix MIME type of non-plain text share intents\" into tm-qpr-dev" }, { "commit": "0d99f586388369ee239547e6e60f30035a29baf5", "tree": "bc73f08887beae7045e0418c339dd38dda4dee18", "parents": [ "ef85e63542ae96570165870a0bae445de1b5ab87", "01a79b5ded1bb40b10be7137117023db699df0e6" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 21:11:06 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:11:06 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: I5acff2b7bb1fadc2e3328086945d16dedcb4aa73\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ef85e63542ae96570165870a0bae445de1b5ab87", "tree": "bc73f08887beae7045e0418c339dd38dda4dee18", "parents": [ "e8b730b5527a39713c21783e385afe8ef4eeef59", "70f81ff108c1d771e4fcf68eba376a3247cccded" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 21:10:25 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:10:25 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: Idd1ba2a33d452de717742cd3bc068af775b7baa8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e8b730b5527a39713c21783e385afe8ef4eeef59", "tree": "8b2b068b7dbf7161255ce9abf1161e605e33f7f0", "parents": [ "aebe4548c2a14ba744abf13b2f5f9d652f682e16", "1e7904ddd300b43e6a5bce6bda90d31918737674" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 21:09:22 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:09:22 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I835fc8d404daca757e53c10081190109ede96fc1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aebe4548c2a14ba744abf13b2f5f9d652f682e16", "tree": "8b2b068b7dbf7161255ce9abf1161e605e33f7f0", "parents": [ "3d89cc5df6729cab8d98c967d73e03e23048d52b", "7c4da0ebf121b0534bb777a53552015ddf884e02" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 21:08:43 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 21:08:43 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: I74a450cd414480e91bd960065f4059690c61d335\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "01a79b5ded1bb40b10be7137117023db699df0e6", "tree": "b743b6f507071c2893adb4897b79c05eb9afe54f", "parents": [ "70f81ff108c1d771e4fcf68eba376a3247cccded", "d05066f4f7cbda2f1f2242d3e6a2f63af35f9aca" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 20:46:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:46:02 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: I82e8ebcee89efe9822ffaf608050e46e4dde85cc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "70f81ff108c1d771e4fcf68eba376a3247cccded", "tree": "b743b6f507071c2893adb4897b79c05eb9afe54f", "parents": [ "1e7904ddd300b43e6a5bce6bda90d31918737674", "cf886522f834508c64d63841264cea08665b241e" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 20:45:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:45:38 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: I94dd2597a8504959f47822a101abe2aa514cd979\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e7904ddd300b43e6a5bce6bda90d31918737674", "tree": "990d3c5a2fd0e4d1ab2c6523bb04c45920ced667", "parents": [ "7c4da0ebf121b0534bb777a53552015ddf884e02", "605261cc55ae5b517b567b9b6d08d95ea46f549d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 20:44:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:44:42 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I5bb50fc570c353100f4cf54636875a8defddfd23\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7c4da0ebf121b0534bb777a53552015ddf884e02", "tree": "990d3c5a2fd0e4d1ab2c6523bb04c45920ced667", "parents": [ "9a382decde13f1d385b21d7790b84f0fe2a389c1", "e855f9c3b3008721c2805efa80891d72557ee943" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 20:44:27 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:44:27 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: Ib44b94840757544bd01a73eed6707f7707e6d895\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e52fddd4b6f7d37dc32f34780206a3139f68fba", "tree": "7c8964c265e9ae4213bf39483e600ce634fdebd4", "parents": [ "de117f20ffd67c2aa554ef6772d272ad018d8a0c" ], "author": { "name": "Matt Casey", "email": "mrcasey@google.com", "time": "Tue Sep 13 21:08:40 2022 +0000" }, "committer": { "name": "Matt Casey", "email": "mrcasey@google.com", "time": "Mon Sep 19 20:31:21 2022 +0000" }, "message": "Fix MIME type of non-plain text share intents\n\nPreviously we piped the MIME type to sharesheet, which was incorrect.\nAlso switch to ClipData.Item\u0027s coerceToText() method to avoid NPE when getText() is null.\n\nAlso pull all the intent creation code into its own class, test it.\n\nBug: 243447863\nBug: 236932369\nBug: 222640396\n\nTest: atest IntentCreatorTest\nTest: Share text copied from Chrome, note that the full correct app list\n comes up.\nChange-Id: Ia438a40423f518275fcd8a09f7de23c511b116fa\n" }, { "commit": "d05066f4f7cbda2f1f2242d3e6a2f63af35f9aca", "tree": "8c67199a9d282096836a91822461c6a8b352ce54", "parents": [ "cf886522f834508c64d63841264cea08665b241e", "151d75d3e85fd892a15680e20f3be3487ec5e040" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 20:19:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:19:02 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: I6d59556e3ee068d14db96ab3154eac5bd1f9ba9d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cf886522f834508c64d63841264cea08665b241e", "tree": "8c67199a9d282096836a91822461c6a8b352ce54", "parents": [ "605261cc55ae5b517b567b9b6d08d95ea46f549d", "18628f192fb59512e2140d9f048ee4b9028a4ccb" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 20:18:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:18:42 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: Ie075e1041f0e417151cbf812a9b3cb1e03f92ec0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "605261cc55ae5b517b567b9b6d08d95ea46f549d", "tree": "940295413c4be3013b1655b2efdc11cf939b292f", "parents": [ "e855f9c3b3008721c2805efa80891d72557ee943", "97f625773a1f1f7ca446750f050ee009c00b64a0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 20:18:17 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:18:17 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I9e480083cb68d0b77deac3231d96586b8ad29115\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e855f9c3b3008721c2805efa80891d72557ee943", "tree": "940295413c4be3013b1655b2efdc11cf939b292f", "parents": [ "9d000dcf5fd6a63a84b54dcb1f7aff5119c61778", "9b928f8140f067d756b06c2a733076ed8b3815a0" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 20:17:51 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 20:17:51 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: Ic54f6aa3bc3fa724a21b53628a8c9ba88c622a18\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "151d75d3e85fd892a15680e20f3be3487ec5e040", "tree": "599c1efcbc09ef13b3c41a18d3eddbc929245f9e", "parents": [ "18628f192fb59512e2140d9f048ee4b9028a4ccb", "526af0d1b15e0e67f5cd260e672c023742b5607d" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 19:51:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:51:16 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: I2054a77b1a5c7dbf4260bcf73c222e5a4a4f027b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "18628f192fb59512e2140d9f048ee4b9028a4ccb", "tree": "599c1efcbc09ef13b3c41a18d3eddbc929245f9e", "parents": [ "97f625773a1f1f7ca446750f050ee009c00b64a0", "73089d0c3ad95c4e75d20bcbc10169c68c77f6b1" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 19:50:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:50:57 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: I7c652c1b5920bd5a226ec4f987f4d38dbbc60f1a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "97f625773a1f1f7ca446750f050ee009c00b64a0", "tree": "d16be3017561a33d0b0e377cf532325ef5d1ca76", "parents": [ "9b928f8140f067d756b06c2a733076ed8b3815a0", "b7075acb14e0228cf1d231a4261c86e53ff0b74c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 19:50:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:50:30 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: Idb1042bd57bb1d0f8d8a4a4d0eaaea412e75a5d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9b928f8140f067d756b06c2a733076ed8b3815a0", "tree": "d16be3017561a33d0b0e377cf532325ef5d1ca76", "parents": [ "0511109afbed92383e18661d4ae6f836b175c9dd", "898d578fa1b517de56ec149a380d5a67cb410d55" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 19:48:52 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:48:52 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: I4f682aaf487e0f082d4b8dfe6159305b84360a40\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e5ed96062d245350d4a1d8a3e271f32175f2994", "tree": "383a4a78e4b7845c57e50fab713f89d6439a14f1", "parents": [ "745d055d20803becba24298d8fadcfcbd92f07fb" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Mon Sep 12 15:35:32 2022 +0000" }, "committer": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Mon Sep 19 19:33:01 2022 +0000" }, "message": "New QS Flashlight Tile Animated Icons\n\nFixes: 245549760\nTest: atest FlashlightTileTest\nChange-Id: I7f6c9efe904fa217c08242e0fa8019875a40fdf5\n" }, { "commit": "526af0d1b15e0e67f5cd260e672c023742b5607d", "tree": "e2bea4fbf044ab12e2f1c3a0d8301acb237bdb77", "parents": [ "73089d0c3ad95c4e75d20bcbc10169c68c77f6b1", "478c97e58c0b49494a01418dd65793b7fc8e5e3f" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 19:21:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:21:30 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: I7e3dcae19c8112d932490408fbab4eb36045d5e5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "73089d0c3ad95c4e75d20bcbc10169c68c77f6b1", "tree": "e2bea4fbf044ab12e2f1c3a0d8301acb237bdb77", "parents": [ "b7075acb14e0228cf1d231a4261c86e53ff0b74c", "10c659e317c56a33afb4ed8900c34cf47d3ad15e" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 19:21:10 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:21:10 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: I9f9dca5eccac9bc82357e1322b3d3534a86e6ac0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b7075acb14e0228cf1d231a4261c86e53ff0b74c", "tree": "b7992948930a9773deee942b0cc6f053bef64b8b", "parents": [ "898d578fa1b517de56ec149a380d5a67cb410d55", "5ddcc96b01576b6e05e4d9225d46a79671563c70" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 19:20:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:20:16 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: Iec721bc5e1d9fbb52634ba16f4d055e253e61f1d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "898d578fa1b517de56ec149a380d5a67cb410d55", "tree": "b7992948930a9773deee942b0cc6f053bef64b8b", "parents": [ "98ba0a3f7aa7799815a723ec8211acebc9eb137a", "d17cc272101bfba3834cd30b3ba29b2f3abf76a6" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 19:19:43 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:19:43 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: Ie0010ea681d0f41e96d0143678e07d5727b4aed0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3493f307ba6045431edb32e41954d2633d704cd7", "tree": "1f5e1155f9cb5f5edb2150e37677db5e0d026f92", "parents": [ "e403afd1c6ef9b81113988a324429d55fd560f4d", "65091e4cac5096fa392ebd3b2d775253bbe5beb6" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 19:01:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 19:01:38 2022 +0000" }, "message": "[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours\n\nam skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19990545\n\nChange-Id: Id7382f128d5b22538e3fadb72474bd71047c86aa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e403afd1c6ef9b81113988a324429d55fd560f4d", "tree": "1f5e1155f9cb5f5edb2150e37677db5e0d026f92", "parents": [ "9421ed72e46c3edbc5a1219743b78234d98ab92c", "590051205d6ca952b9306b0bf1ce1ffe15f60d4c" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Mon Sep 19 18:57:27 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 18:57:27 2022 +0000" }, "message": "Merge \"[Bouncer] reset bouncer visibility with doze state.\" into tm-qpr-dev" }, { "commit": "478c97e58c0b49494a01418dd65793b7fc8e5e3f", "tree": "41a5ad649e19607448562949e19cf09d770165e8", "parents": [ "10c659e317c56a33afb4ed8900c34cf47d3ad15e", "ae7a1df57df8680ee221c64c995287131364fd8c" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 18:43:49 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:43:49 2022 +0000" }, "message": "[automerger skipped] Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours\n\nam skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: Id059621a771490861b3fd4fa491a6dd338e14b81\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "10c659e317c56a33afb4ed8900c34cf47d3ad15e", "tree": "41a5ad649e19607448562949e19cf09d770165e8", "parents": [ "5ddcc96b01576b6e05e4d9225d46a79671563c70", "7588fa68660be986abf983eddfe2beb6d7db5085" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 18:43:22 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:43:22 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695 am: 7588fa6866\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: I7e0febed51091e07af6be4157d081c837a719589\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ddcc96b01576b6e05e4d9225d46a79671563c70", "tree": "9ec5e642a59de3cba8706db1df5322efb87207e7", "parents": [ "d17cc272101bfba3834cd30b3ba29b2f3abf76a6", "f3c6684b16f706fa715cc2edaf6fdcd476ce3d82" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 18:42:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:42:38 2022 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I08835ffbb0ab13ba76c47bfe0e2d1d3d7a5788ff\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d17cc272101bfba3834cd30b3ba29b2f3abf76a6", "tree": "9ec5e642a59de3cba8706db1df5322efb87207e7", "parents": [ "74592430e25262478489d5d8987e14f553ae4bce", "02b525316e6df26940d75b178dd595f609495c5e" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 18:41:36 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:41:36 2022 +0000" }, "message": "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212\n\nChange-Id: Ie62c1837d7eb8bdb25c51ec2d797bcda4b958ae8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9421ed72e46c3edbc5a1219743b78234d98ab92c", "tree": "f89eadeb8185b7cee038706e120e173b28a5aaf8", "parents": [ "66f5377be9fd4fbabb2179fdde8d7f30b150ce58", "8df28a63f8ad248e2c41346d68b2c9223b2803ca" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 18:41:16 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 18:41:16 2022 +0000" }, "message": "Merge \"Set elapsedRealtime if HAL doesn\u0027t set it\" into tm-qpr-dev" }, { "commit": "65091e4cac5096fa392ebd3b2d775253bbe5beb6", "tree": "23f7d79a832f149ee298aaaae3674d99d72910bf", "parents": [ "6c9ae0c8812c66386c6821de7a354e6f1640c336", "3d89cc5df6729cab8d98c967d73e03e23048d52b" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 18:30:36 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:30:36 2022 +0000" }, "message": "[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours\n\nam skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19990545\n\nChange-Id: I8a9908159ff4caebddf1433437fe36d128a17aaf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ae7a1df57df8680ee221c64c995287131364fd8c", "tree": "e6c56e0f705bef107dea381767e5cce1f1095664", "parents": [ "7588fa68660be986abf983eddfe2beb6d7db5085", "b625b562c41cd3f68aebdd33f96f766209ecfa15" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 18:19:25 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:19:25 2022 +0000" }, "message": "Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: Ic0c235c82f13e4e8f09b35bb9f30134cfcf8617e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7588fa68660be986abf983eddfe2beb6d7db5085", "tree": "f1ff39a19726e42d4d752c937ce9b9b44554ac3a", "parents": [ "f3c6684b16f706fa715cc2edaf6fdcd476ce3d82", "6505ed1695a1509e7e16dc5898924adcb3e422c5" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 18:18:04 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:18:04 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: Ia708dba5893575578ae7a383dd823a3726b5aab4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f3c6684b16f706fa715cc2edaf6fdcd476ce3d82", "tree": "1ec5aa948b323cf4faecbb6b939319db4b069006", "parents": [ "02b525316e6df26940d75b178dd595f609495c5e", "c184d7b7217b9632169964da81ed11edff08b72f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 18:17:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:17:30 2022 +0000" }, "message": "Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I6ea11a78ee30c911dee0fe1e71b1bfb422751951\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac1bbfef631f238a280652d6bf21cb8ed36fd77f", "tree": "8a875e86b8dfec6c5d484de33f8618eac36850d4", "parents": [ "d6c6f5865f5955deb0294e23d711ac9a1596b703" ], "author": { "name": "Chandru", "email": "chandruis@google.com", "time": "Mon Sep 19 17:51:15 2022 +0000" }, "committer": { "name": "Chandru", "email": "chandruis@google.com", "time": "Mon Sep 19 17:52:57 2022 +0000" }, "message": "Add test size to TakeScreenshotServiceTest\n\nTest: N/A\nFixes: 245410818\nChange-Id: I99f66e311b4bbcfa07b4a7a36c6b62bdbd2359a6\n" }, { "commit": "66f5377be9fd4fbabb2179fdde8d7f30b150ce58", "tree": "c1455bd9ee3220847da2709299ecf9193e45c2e9", "parents": [ "bd92f05e665b41a83234ba93391a08ad2006459e", "e5383425e16718bf7fa6c31206f515e6d32f6d7f" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Mon Sep 19 17:42:23 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 17:42:23 2022 +0000" }, "message": "Merge \"Ensure state is set correctly after animateAppearOnLockscreen is called\" into tm-qpr-dev" }, { "commit": "9ab47fa93ed9751e10fbc0d4f2f2d40360e39f42", "tree": "e41bd8699cad6bd2af17a0901b581279e1e6bc2a", "parents": [ "745d055d20803becba24298d8fadcfcbd92f07fb" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Mon Sep 19 17:05:56 2022 +0000" }, "committer": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Mon Sep 19 17:41:46 2022 +0000" }, "message": "Added QS Screen Record Animated Icons\n\nFixes: 247553701\nTest: atest ScreenRecordTileTest\nTest: Manually tapped tile on and off\nChange-Id: I5b5890c2281705dc27ddb3e6c88654c101103d4a\n" }, { "commit": "0a234cf41cf04d4516d94ece49ff7a4f9a255ee7", "tree": "6e0327bc40453db58422be78836c3bc5f533c710", "parents": [ "745d055d20803becba24298d8fadcfcbd92f07fb" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Mon Sep 19 16:39:04 2022 +0000" }, "committer": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Mon Sep 19 17:22:04 2022 +0000" }, "message": "Updated QS Airplane Mode Icons\n\nFixes: 247542507\nTest: Manually tapped icon on and off\nChange-Id: I3f6610f779b159a3e468b6151d42bfb014452dcc\n" }, { "commit": "bd92f05e665b41a83234ba93391a08ad2006459e", "tree": "39fa39f5a24e0c919b9cb43be0228407385d33ab", "parents": [ "fa0dc28b4c26ad83c631559e48e8e075777ee824", "90a5f092f19e4cbfc15dff7913fc9650305f5568" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Mon Sep 19 16:26:06 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 16:26:06 2022 +0000" }, "message": "Merge \"MediaPlayer will now transition the background with color scheme\" into tm-qpr-dev" }, { "commit": "fa0dc28b4c26ad83c631559e48e8e075777ee824", "tree": "b87009c4f10e8b980cff0fbd60dd17bdd13fa5d6", "parents": [ "762f54da6a223e5cfaf84e698646c375336fd301", "9e18e6ad66ba51e3a05cadb71b4d8e95e792ab96" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Mon Sep 19 16:15:15 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 16:15:15 2022 +0000" }, "message": "Merge \"Clocks now correctly respond to font setting changes\" into tm-qpr-dev" }, { "commit": "762f54da6a223e5cfaf84e698646c375336fd301", "tree": "9d962fa4a35404db50703cf3610d3a673cdf5605", "parents": [ "0b180ddbed4d5fa79f6f76d1863bb9eebf00bf54", "d68feb3f4adb9c241eca08d06cf2c437b78cfef8" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Mon Sep 19 15:26:39 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 15:26:39 2022 +0000" }, "message": "Merge \"Refer to FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI to launch the VolumePanel in SystemUI or in Settings\" into tm-qpr-dev" }, { "commit": "54a7b623b1a165b085bd74358268636675453bad", "tree": "1e09c8cc7039287e8da58bf829881e93039e3bc6", "parents": [ "88deb417100bb49a325bb9078c3d3b72f16b4b7b" ], "author": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Mon Sep 19 14:23:44 2022 +0000" }, "committer": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Mon Sep 19 15:19:01 2022 +0000" }, "message": "Do not use stableDisplaySize for scale factor\n\nThe stableDisplaySize doesn\u0027t account for different\ndisplays, and only returns the stable display size of one of the\ndisplays. Instead of using stableDisplaySize, use the\nmaxResolutionDisplayMode for the current display to determine\nwhether the resolution of the device changed.\n\nTest: manually check that lock icon is an expected size\non a device with multiple displays\nTest: UDFPS is the correct size at different display resolutions\nFixes: 246631157\n\nChange-Id: Iea933733f00ac7b8446ce6fc5825475e4b490655\n" }, { "commit": "0b180ddbed4d5fa79f6f76d1863bb9eebf00bf54", "tree": "66ef50e261205bbbf84af7ed98088a1282f14985", "parents": [ "dee5e5cfe9cc693b3511c8107bf9c67fc70d719e", "92facaa6a2333a39aacfb58955dff6db062c71c5" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Mon Sep 19 14:15:52 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 14:15:52 2022 +0000" }, "message": "Merge \"Extra Dim QS Animated Icon\" into tm-qpr-dev" }, { "commit": "87c0106ea7ef8736aba9fd367cdd4b5558d34fec", "tree": "5d685fe9a4c3f711b99521bcb8e8d826b16e9e71", "parents": [ "131fb1ff890f843ce0c176a318127bdc726ef926" ], "author": { "name": "Ahan Wu", "email": "ahanwu@google.com", "time": "Fri Aug 26 18:31:31 2022 +0000" }, "committer": { "name": "Wu Ahan", "email": "ahanwu@google.com", "time": "Mon Sep 19 13:48:08 2022 +0000" }, "message": "DO NOT MERGE: Enable presubmit for com.android.internal.jank\n\nThis CL consists of following parts:\n - TEST_MAPPING files for presubmit.\n - Correct CUJ constant definitions in LatencyTracker.\n - Use auto-generated enum constants instead of hardcoded\n numbers in LatencyTracker.\n - Create LatencyTrackerTest to test:\n - The constant names of CUJ definitions should be the same with\n corresponding enum names.\n - The amount of CUJ definitions should be the same with\n the amount of enums, means both must be added at the same time.\n - The static getNameOfXX() methods return just the name of the\n CUJ constant definitions.\n - The CUJ constant definitions has 1:1 mapping onto the enums.\n\nBug: 245250904\nTest: check TH if FrameworksCoreTests is triggered\nTest: atest FrameTrackerTest InteractionJankMonitorTest\nTest: atest LatencyTrackerTest\nChange-Id: I0a6f403694039aec6b9ce44254f6c5cab531f765\nMerged-In: Ibddd36410a0d4a909522de011f23a337b53d6889\n" }, { "commit": "02b525316e6df26940d75b178dd595f609495c5e", "tree": "1ec5aa948b323cf4faecbb6b939319db4b069006", "parents": [ "85d0cb310cc3d7f600d88c95e036ad85c7d7d734", "a30148b8a40a36cababba1ff434d053cfd7dd6e3" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Thu Sep 15 17:12:32 2022 +0000" }, "committer": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 13:46:09 2022 +0000" }, "message": "[conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: Ie85c312ad47c5be276010f0a96d64e058be2fbda\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dee5e5cfe9cc693b3511c8107bf9c67fc70d719e", "tree": "e32ee7dbcab6a9cebd9a5ede7e336c424a403750", "parents": [ "6d0518e98140800660258c9a1f66aba042874dd6", "4e18a84fcf850d2718590c8b1df87098e60e5376" ], "author": { "name": "Vali Calinescu", "email": "vcalinescu@google.com", "time": "Mon Sep 19 11:50:15 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 11:50:15 2022 +0000" }, "message": "Merge \"Set letterbox verticalPositionMultiplier to 0\" into tm-qpr-dev" }, { "commit": "6d0518e98140800660258c9a1f66aba042874dd6", "tree": "6344cf7a0eeffc6ae0a967401eee178c50423a2a", "parents": [ "4dc756781afb8c298554e0c26a89cc66459d2881", "c022f353c5555d7253cecba35b71d9040bf21071" ], "author": { "name": "Vali Calinescu", "email": "vcalinescu@google.com", "time": "Mon Sep 19 11:50:15 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 11:50:15 2022 +0000" }, "message": "Merge \"Fix display cutout vertical centering bug\" into tm-qpr-dev" }, { "commit": "3d89cc5df6729cab8d98c967d73e03e23048d52b", "tree": "8b2b068b7dbf7161255ce9abf1161e605e33f7f0", "parents": [ "40739d5379d5b0f96d48a0759aeb4528ec15b57f" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Thu Aug 04 13:00:39 2022 +0000" }, "committer": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 11:11:49 2022 +0000" }, "message": "Do not dismiss keyguard after SIM PUK unlock\n\nAfter PUK unlock, multiple calls to\nKeyguardSecurityContainerController#dismiss() were being called from\nthe KeyguardSimPukViewController, which begins the transition to the\nnext security screen, if any. At the same time, other parts of the\nsystem, also listening to SIM events, recognize the PUK unlock and\ncall KeyguardSecurityContainer#showSecurityScreen, which updates which\nsecurity method comes next. After boot, this should be one of PIN,\nPassword, Pattern, assuming they have a security method. If one of the\nfirst dismiss() calls comes AFTER the security method changes, this is\nincorrectly recognized by the code as a successful\nPIN/pattern/password unlock. This causes the keyguard to be marked as\ndone, causing screen flickers and incorrect system state.\n\nThe solution: every call to dismiss() should include a new parameter\nfor the security method used. If there is a difference between this\nparameter and the current value in KeyguardSecurityContainerCallback,\nignore the request, as the system state has changed.\n\nFixes: 238804980\nBug: 218500036\nTest: atest KeyguardSecurityContainerTest\nAdminSecondaryLockScreenControllerTest KeyguardHostViewControllerTest\nKeyguardSecurityContainerControllerTest\n\nChange-Id: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243\nMerged-In: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243\n(cherry picked from commit 37aeb26b0ae28a48c1ed40f008d5808d8a84be23)\n" }, { "commit": "1c1f58ca75f648c6c7c06ebdd354183881425ea4", "tree": "e611f7216bc078222322602ac3d99341452ddd6b", "parents": [ "d6c6f5865f5955deb0294e23d711ac9a1596b703" ], "author": { "name": "Chandru", "email": "chandruis@google.com", "time": "Thu Sep 15 20:44:46 2022 +0000" }, "committer": { "name": "Chandru", "email": "chandruis@google.com", "time": "Mon Sep 19 08:50:15 2022 +0000" }, "message": "Cleans up any stray instances of KeyguardUpdateMonitor that might still\nhave listeners attached to system services.\n\nTest: atest KeyguardUpdateMonitorTest\nFixes: 246915415\nChange-Id: I0d22116befbd4029e901e75db27bb6e083028118\n" }, { "commit": "6eda3a1d1a48f31591314185a814e54335f84098", "tree": "c5519eb341b94ab5c4e8ea141d2b8c95b98b8841", "parents": [ "4dc756781afb8c298554e0c26a89cc66459d2881" ], "author": { "name": "Ilya Matyukhin", "email": "ilyamaty@google.com", "time": "Fri Sep 09 23:30:33 2022 -0700" }, "committer": { "name": "Ilya Matyukhin", "email": "ilyamaty@google.com", "time": "Mon Sep 19 06:13:06 2022 +0000" }, "message": "Refactor UDFPS display logic and remove illumination\n\nBug: 243818429\nTest: atest SystemUITests\nChange-Id: I285f136a75bbd26226a39c544f3c07101ff8eb80\nMerged-In: I285f136a75bbd26226a39c544f3c07101ff8eb80\n" }, { "commit": "4dc756781afb8c298554e0c26a89cc66459d2881", "tree": "87c20196dfee64a6d24404a0d0859fd8e007d311", "parents": [ "1d073c96000c1049ce489ad46ba62ca70c0b239c", "2b0851c43bf5a6561986fc96397eb40d0fffe764" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 03:29:18 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 03:29:18 2022 +0000" }, "message": "Merge \"Override Internet Dialog\u0027s TalkBack description\" into tm-qpr-dev" }, { "commit": "d68feb3f4adb9c241eca08d06cf2c437b78cfef8", "tree": "6de8e7474aeca33f2edab23a1ffe26f5fa4aeb5c", "parents": [ "d6c6f5865f5955deb0294e23d711ac9a1596b703" ], "author": { "name": "Alan Huang", "email": "alanjhhuang@google.com", "time": "Sun Sep 18 20:26:55 2022 +0000" }, "committer": { "name": "Alan Huang", "email": "alanjhhuang@google.com", "time": "Sun Sep 18 20:26:55 2022 +0000" }, "message": "Refer to FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI to launch\nthe VolumePanel in SystemUI or in Settings\n\nBug: 202262476\nTest: manual build and test with the feature flag on/off\nChange-Id: I7206fb2afb839f05cc016ece7d29540ace8910ed\n" }, { "commit": "09c0d6ef9e977bd07d92446556972ad0f7158a72", "tree": "d86cd630f665e95f547e6b25b3e26b99052b16eb", "parents": [ "3e652032ec824ac88f85de831e75fd8133f04970" ], "author": { "name": "Jeff Chang", "email": "chengjeff@google.com", "time": "Fri Sep 16 09:08:11 2022 +0800" }, "committer": { "name": "Jeff Chang", "email": "chengjeff@google.com", "time": "Sun Sep 18 23:06:12 2022 +0800" }, "message": "Allow background activity launch by drag notification\n\nDrag notification to launch activity is aborted since the app is not\nvisible.\n\nThis CL adds the background activity allowed flag to make activity\nlaunches successful.\n\nBug: 237985674\nTest: Drag the notification to home. Check the activity is launched.\nChange-Id: I6513e7d5d7b17c4a41c32316fd7504fe1bf2e793\n" }, { "commit": "92facaa6a2333a39aacfb58955dff6db062c71c5", "tree": "a44b6ed6991c352ca7c92a3fe27cd39182c9fa85", "parents": [ "745d055d20803becba24298d8fadcfcbd92f07fb" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Sat Sep 17 05:45:33 2022 +0000" }, "committer": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Sat Sep 17 05:45:33 2022 +0000" }, "message": "Extra Dim QS Animated Icon\n\nFixes: 247162592\nTest: atest ReduceBrightColorsTileTest\nTest: Manually tapped tile on and off\nChange-Id: I72a15b2a81875ffa1653cce9c897ce1861ea889c\n" }, { "commit": "1d073c96000c1049ce489ad46ba62ca70c0b239c", "tree": "cea00e77139bba3595fced34fd255a66994735a2", "parents": [ "124782dc033c083fd918d295b5435f9d16d369bc", "3d023f4a3bfc269c82990452fdc1d97984296e13" ], "author": { "name": "Angela Wang", "email": "angelala@google.com", "time": "Sat Sep 17 01:00:19 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Sep 17 01:00:19 2022 +0000" }, "message": "Merge \"Logs hearing aid information when a hearing aid is bonded(connected)\" into tm-qpr-dev" }, { "commit": "9e18e6ad66ba51e3a05cadb71b4d8e95e792ab96", "tree": "5286a5856ecc269c582c6bb3a2683147a78e59f4", "parents": [ "60e003dd4470a1034657c34c3f9dd56416e44986" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Fri Sep 16 20:22:23 2022 +0000" }, "committer": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Sat Sep 17 00:41:16 2022 +0000" }, "message": "Clocks now correctly respond to font setting changes\n\nBug: 247155813\nTest: Manually validated the small clock changes correctly\nChange-Id: Ib7be0b5a3130b30ac98d4d7be668839fc924cd81\n" }, { "commit": "124782dc033c083fd918d295b5435f9d16d369bc", "tree": "ffee6180791cdc9428c4b7272e90e9a87d762c52", "parents": [ "0a0969af1caa3f7911491a810b84437c77088d39", "61f1075626ba914261bb425e3fa8c1fc15b888cc" ], "author": { "name": "Shan Huang", "email": "shanh@google.com", "time": "Sat Sep 17 00:35:11 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Sep 17 00:35:11 2022 +0000" }, "message": "Merge \"Migrate AuthContainerView to predictive back\" into tm-qpr-dev" }, { "commit": "0a0969af1caa3f7911491a810b84437c77088d39", "tree": "90380da4705cd1119507296a5a549108fb22d565", "parents": [ "745d055d20803becba24298d8fadcfcbd92f07fb", "8a3cf44c9abcd1d72338a31e27b53f523bf3b7bd" ], "author": { "name": "Ats Jenk", "email": "atsjenk@google.com", "time": "Sat Sep 17 00:16:33 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Sep 17 00:16:33 2022 +0000" }, "message": "Merge \"Move active task tracking to a repository\" into tm-qpr-dev" }, { "commit": "e5383425e16718bf7fa6c31206f515e6d32f6d7f", "tree": "3f683c8fdc746e6b5c4dd193df1a929dabd30857", "parents": [ "60e003dd4470a1034657c34c3f9dd56416e44986" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Fri Sep 16 18:26:40 2022 +0000" }, "committer": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Fri Sep 16 23:12:10 2022 +0000" }, "message": "Ensure state is set correctly after animateAppearOnLockscreen is called\n\nBefore the textAnimator is initialized, animateAppearOnLockscreen can\nbe called to set the color to be correctly set on the AnimatableClockView.\nAs a result, we should not suppress the calls to setTextStyle so that\nthe correct setTextStyle call is cached in onTextAnimatorInitialized.\n\nFixes: 246831875\nTest: Manually checked broken usecase and several working usecases\nChange-Id: I9ffbb34bc314affe64180ab1bbea411bebe37d2d\n" }, { "commit": "745d055d20803becba24298d8fadcfcbd92f07fb", "tree": "812065a36442fa77597b509df955e77951a33842", "parents": [ "488a69bfc46df63c392a30dfefd112e4cb69a1ce", "b48df1b4d1d6d711efaed42f018f36f2b256af0f" ], "author": { "name": "Ryan Zuklie", "email": "rzuklie@google.com", "time": "Fri Sep 16 23:09:20 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 23:09:20 2022 +0000" }, "message": "Merge \"Export BatteryStats info to Atrace.\" into tm-qpr-dev" }, { "commit": "7d7d64032e7844aa526b668b3b49ea0d3a2110a4", "tree": "203e1b304fe512097a1a423792ca38e6c96a6d3c", "parents": [ "88deb417100bb49a325bb9078c3d3b72f16b4b7b" ], "author": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Fri Sep 16 21:42:21 2022 +0000" }, "committer": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Fri Sep 16 22:58:55 2022 +0000" }, "message": "Update FP sensor location before showing dwellAnim\n\nThe location may have changed if the resolution changed.\nThe fingerprint location is cached in the AuthController.\n\nTest: atest AuthRippleControllerTest\nTest: change the resolution and then auth with UDFPS, see\nthat the dwell ripple is in the correct spot\nFixes: 246741099\n\nChange-Id: I8b0ad2c9b400e410c2ee343fe3c18de53aa0798b\n" }, { "commit": "488a69bfc46df63c392a30dfefd112e4cb69a1ce", "tree": "fd3d35f5e9c33e65736595deed686f97f9e633d8", "parents": [ "b25a29ed883e39142f5cc9cd45bb26fe35b8feae", "e4a9f826067b8c9f0aa2795bdc994566992c9027" ], "author": { "name": "Matt Sziklay", "email": "mattsziklay@google.com", "time": "Fri Sep 16 22:39:07 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 22:39:07 2022 +0000" }, "message": "Merge \"Show captions on tablets even when display windowing mode is fullscreen.\" into tm-qpr-dev" }, { "commit": "8a3cf44c9abcd1d72338a31e27b53f523bf3b7bd", "tree": "acc246f75dc865e890faa7ce8283a10423113470", "parents": [ "db23075abbca9abbded4586f479ad88c5f35f865" ], "author": { "name": "Ats Jenk", "email": "atsjenk@google.com", "time": "Thu Sep 15 14:01:15 2022 -0700" }, "committer": { "name": "Ats Jenk", "email": "atsjenk@google.com", "time": "Fri Sep 16 13:51:42 2022 -0700" }, "message": "Move active task tracking to a repository\n\nWe were tracking active freeform tasks in the RecentTasksController.\nThis causes some issues when we want to share that information to other\ncontrollers like DesktopModeController.\nMove tracking of active tasks to a separate repository that controllers\ncan query and listen for updates.\n\nBug: 244348395\nTest: atest DesktopModeTaskRepositoryTest RecentTasksControllerTest\nChange-Id: I7a460020f6b2133225e292a04f29ae1dd27e964b\n" }, { "commit": "b25a29ed883e39142f5cc9cd45bb26fe35b8feae", "tree": "13ccbc39c0c207dd5bafa7516c5cbeb431938d9a", "parents": [ "31d378dfbe270c7c070f4eac9da253347ff9e84c", "1e45037d9030a01670c7b2171440233aaaab02ac" ], "author": { "name": "Maryam Dehaini", "email": "mdehaini@google.com", "time": "Fri Sep 16 19:58:36 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 19:58:36 2022 +0000" }, "message": "Merge \"Fixing UI Crash\" into tm-qpr-dev" }, { "commit": "31d378dfbe270c7c070f4eac9da253347ff9e84c", "tree": "251239a11dd9db1597e26ef3b4cfe81f57c83ca2", "parents": [ "a609be893878e874e1c4703ac9fe1aeac2f532ac", "e856096f55095df2d22c8bfc4173eedb25c87481" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Fri Sep 16 18:57:04 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 18:57:04 2022 +0000" }, "message": "Merge \"Fix cross profile NLS notif event delivery\" into tm-qpr-dev" }, { "commit": "a609be893878e874e1c4703ac9fe1aeac2f532ac", "tree": "80cd81a63c6466edc72bcdd539e69f4561bf3ed4", "parents": [ "43c7da8e6e1a29b1d100199e43e71436b6901f90", "60aff8eef500e80ade898d24da7cd28c583a0a38" ], "author": { "name": "Ale Nijamkin", "email": "nijamkin@google.com", "time": "Fri Sep 16 18:41:48 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 18:41:48 2022 +0000" }, "message": "Merge \"Adds UserSwitcher screen to Compose Gallery app\" into tm-qpr-dev" }, { "commit": "590051205d6ca952b9306b0bf1ce1ffe15f60d4c", "tree": "cef245e925b382bf80ebd9d686d57afb991de808", "parents": [ "6170285a1a580b7d7d8e14ff8cb48677af57c976" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Thu Sep 15 14:23:56 2022 -0700" }, "committer": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Fri Sep 16 10:38:16 2022 -0700" }, "message": "[Bouncer] reset bouncer visibility with doze state.\n\nWhen doze state is no longer dozing, we were not resetting the bouncer\nview. Here, regardless of set to doze or set to not doze, we reset the\nbouncer view.\n\nFixes: 237822716\nTest: Added a unit test and test manually.\nChange-Id: Ia58356827ffbc96c5467369dc1e00ed9e4535e5e\n" }, { "commit": "43c7da8e6e1a29b1d100199e43e71436b6901f90", "tree": "1e8f336de1a38b488394709997210f1afd5067c4", "parents": [ "5669430c595adfcd08da6956a14d49af931d3c8c", "416e8cc49abc6e297b26b3afb784b798086d625c" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Fri Sep 16 17:28:50 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 17:28:50 2022 +0000" }, "message": "Merge \"Fix Squiggly line inconsistency.\" into tm-qpr-dev" }, { "commit": "5669430c595adfcd08da6956a14d49af931d3c8c", "tree": "7f78728d812b06d8e4b17fa9228e958e848aa872", "parents": [ "79583290cdfc1c3d0675c160579087a1347142c3", "43d7da7d0bf62bd7cc663ada1ef75a81fc90a711" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Fri Sep 16 17:09:10 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 17:09:10 2022 +0000" }, "message": "Merge \"Added Animated Nightlight QS Tile Icons\" into tm-qpr-dev" }, { "commit": "79583290cdfc1c3d0675c160579087a1347142c3", "tree": "16c294dbb21f6a5e59991f168e254a9e016de2d5", "parents": [ "be41e6a2a89f677a9244128799dfec762be3dc5e", "70099d6f94c4e6848440b38967288c3a539df0b3" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Fri Sep 16 17:08:42 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 17:08:42 2022 +0000" }, "message": "Merge \"Replaced Invert Colors QS Icons with New Animation\" into tm-qpr-dev" }, { "commit": "be41e6a2a89f677a9244128799dfec762be3dc5e", "tree": "a8c7989c08c148cece9922575d146f5a031369d6", "parents": [ "d6c6f5865f5955deb0294e23d711ac9a1596b703" ], "author": { "name": "Xiaowen Lei", "email": "xilei@google.com", "time": "Thu Sep 01 19:56:18 2022 +0000" }, "committer": { "name": "Xiaowen Lei", "email": "xilei@google.com", "time": "Fri Sep 16 17:07:52 2022 +0000" }, "message": "For shell transition, register remote for DREAM occluding Keyguard.\n\nBug: 222507937\nTest: on device, with shell transtion flag on\nChange-Id: I55f1eb1ed89caf2fb682cbc9580e8461482b8820\nMerged-In: I55f1eb1ed89caf2fb682cbc9580e8461482b8820\n" }, { "commit": "d6c6f5865f5955deb0294e23d711ac9a1596b703", "tree": "03d1495dcd59a28684c969a82c6845705a94d612", "parents": [ "63caeaf9fac56d10706b2b5b0fc3ddddab34f099", "6a1363adc8e78f5fd2edcce922e17ca12751ce31" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Fri Sep 16 16:38:27 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 16:38:27 2022 +0000" }, "message": "Merge \"Use transition for desktop-mode switch when enabled\" into tm-qpr-dev" }, { "commit": "e4a9f826067b8c9f0aa2795bdc994566992c9027", "tree": "c2714eea7b8fd942d1b06d457747ce0636fa93ed", "parents": [ "73d8f6cea3e3086580aaac17bea2532d4a046a32" ], "author": { "name": "mattsziklay", "email": "mattsziklay@google.com", "time": "Thu Sep 01 13:11:33 2022 -0700" }, "committer": { "name": "mattsziklay", "email": "mattsziklay@google.com", "time": "Fri Sep 16 09:26:48 2022 -0700" }, "message": "Show captions on tablets even when display windowing mode is fullscreen.\n\nChanges the criteria for showing caption on fullscreen tasks to check\nif the device is a tablet based on screen size rather than using display\nwindowing mode.\n\nBug: 243671025\nTest: Manual testing; launched fullscreen tasks on multiple devices with\nand without desktop mode flag enabled.\n\nChange-Id: I4550f040daef9c55edaaf42bcfc2004a23e6924f\n" }, { "commit": "63caeaf9fac56d10706b2b5b0fc3ddddab34f099", "tree": "425cb389f5bcd125c7402d35673ed0dbddeaba44", "parents": [ "9ce67ba2844a7c0c86f1c64b86b6b46a7c4dd11c", "0cde4a92020e89f568372d79e58bb19e33d4ac89" ], "author": { "name": "Mady Mellor", "email": "madym@google.com", "time": "Fri Sep 16 16:19:45 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 16:19:45 2022 +0000" }, "message": "Merge \"Expose getTaskInfo on TaskView\" into tm-qpr-dev" }, { "commit": "9ce67ba2844a7c0c86f1c64b86b6b46a7c4dd11c", "tree": "42b9a6ce8d06abe2b7acd1cb4df64dc94bcee9d0", "parents": [ "864d640e8d2914ba8ca49fc51a5c90c6ced6d4b6", "8e053866784544f1be505359ce55bfcbc07eceec" ], "author": { "name": "Rasheed Lewis", "email": "rasheedlewis@google.com", "time": "Fri Sep 16 16:05:40 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 16:05:40 2022 +0000" }, "message": "Merge \"Replaced Data Saver Icons with Animation\" into tm-qpr-dev" }, { "commit": "416e8cc49abc6e297b26b3afb784b798086d625c", "tree": "aa9a39dba84e5be5e4f8b0d0c63806efa558c9ee", "parents": [ "60e003dd4470a1034657c34c3f9dd56416e44986" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Wed Sep 14 21:05:43 2022 +0000" }, "committer": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Fri Sep 16 15:37:19 2022 +0000" }, "message": "Fix Squiggly line inconsistency.\n\nThe squiggly line was skipping around a bit. This was previously\nhidden by the squiggly ball. I took the opportunity to reverse\nthe line direction so it doesn\u0027t move relative to the player\nposition.\n\nFixes: 246776610\nTest: Manually checked squiggle on device\nChange-Id: If9e8bd5bf68214c0d56b4995796c39291512733c\n" }, { "commit": "864d640e8d2914ba8ca49fc51a5c90c6ced6d4b6", "tree": "80b2d45691765fa4f4b3e0e45cc74f7fd3d56db3", "parents": [ "60e003dd4470a1034657c34c3f9dd56416e44986", "6c9ae0c8812c66386c6821de7a354e6f1640c336" ], "author": { "name": "Lais Andrade", "email": "lsandrade@google.com", "time": "Fri Sep 16 15:33:10 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 16 15:33:10 2022 +0000" }, "message": "Merge \"Remove VibrationEffect javadocs to methods not available in public APIs.\" into tm-dev am: 40739d5379 am: 6c9ae0c881\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19927366\n\nChange-Id: Ic1f5ba8452dd775377d3e60400f274cc8747f9d7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "60e003dd4470a1034657c34c3f9dd56416e44986", "tree": "1225e86dd6db81403dc51d0d241bda0dc7e6f759", "parents": [ "7b4c3efca3321d0a6402bc8b2cc955e3822380e0", "3140d3530c8ef2fe09c7d1a6714f135716963325" ], "author": { "name": "Hawkwood Glazier", "email": "jglazier@google.com", "time": "Fri Sep 16 15:00:01 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 16 15:00:01 2022 +0000" }, "message": "Merge \"[DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev\" into tm-qpr-dev" } ], "next": "7b4c3efca3321d0a6402bc8b2cc955e3822380e0" }