)]}' { "log": [ { "commit": "2a19f3bf4ea96890ebfe5ee43c525b1107f0b325", "tree": "3e448527a9147aa1241b9d8b9f92d58ed62adc1e", "parents": [ "08e900bbfb128508fe0318db55b400dd369e9aae", "d2947a060e273c25fbd84c26ee12f8b58e1bc9e7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Nov 30 16:33:44 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 30 16:33:44 2022 +0000" }, "message": "Merge \"Fix \u0027Generic.kl\u0027 file has no \u0027ZOOM_IN\u0027 and \u0027ZOOM_OUT\u0027 mapping\" am: 378996edac am: d2947a060e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2319754\n\nChange-Id: Ife84a4e6da2c7c1898082a249aec5e7c0337ba77\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d2947a060e273c25fbd84c26ee12f8b58e1bc9e7", "tree": "0226470aa3a5aacf4a3206790c579716ecea3c5e", "parents": [ "8adafcece23c0be35d20c72db8991ea432c916c6", "378996edac36241b59bded0c8ba8213497baa207" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Nov 30 16:04:49 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 30 16:04:49 2022 +0000" }, "message": "Merge \"Fix \u0027Generic.kl\u0027 file has no \u0027ZOOM_IN\u0027 and \u0027ZOOM_OUT\u0027 mapping\" am: 378996edac\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2319754\n\nChange-Id: I559e2f51c424107445347303925cfa5751d3b969\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fdff9ae59b9f59af4a419262a8eb31e095097f57", "tree": "db16d16f0fe66a9bdecb2f7a113826644a16aa89", "parents": [ "a7acd5d5a7aa273be82972d5663c5fe2242e66c2" ], "author": { "name": "zhangzhihao7", "email": "zhangzhihao7@xiaomi.corp-partner.google.com", "time": "Wed Nov 30 11:30:51 2022 +0800" }, "committer": { "name": "zhangzhihao7", "email": "zhangzhihao7@xiaomi.corp-partner.google.com", "time": "Wed Nov 30 11:30:51 2022 +0800" }, "message": "Fix \u0027Generic.kl\u0027 file has no \u0027ZOOM_IN\u0027 and \u0027ZOOM_OUT\u0027 mapping\n\n\u0027KEYCODE_ZOOM_IN\u0027 and \u0027KEYCODE_ZOOM_OUT\u0027 are defined in \u0027keycodes.h\u0027 and \u0027keyEvent.java\u0027, but not mapped in \u0027Generic.kl\u0027. I think this is used by the camera to adjust the focus and it should be sent to the camera.\n\nChange-Id: Ib5057ca2151de7a91bfec7f646ad9f491789cc0c\nSigned-off-by: zhangzhihao7 \u003czhangzhihao7@xiaomi.corp-partner.google.com\u003e\n" }, { "commit": "fe16fe6f8c8329956917bf59a42295e61225027f", "tree": "3b213e2f05f0ec8f7e9e25f105490780cda73d04", "parents": [ "f1b8606c17bf3fd690e3370b7f77b1f3853af32d", "ac0cf4e9aebb58c03a0cadaf2be420e75d00223b" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Nov 23 11:28:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 23 11:28:16 2022 +0000" }, "message": "Merge \"Clean-up after TZUvA feature removal.\" am: 06b9abf013 am: ac0cf4e9ae\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2300422\n\nChange-Id: Id8a86a06c500d6e58571ec903a4238613597eae8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac0cf4e9aebb58c03a0cadaf2be420e75d00223b", "tree": "905262e4872ae712d0e8cd4c55f18be6e2f49a1a", "parents": [ "fef043d4ea9dbbe07dcf910689b895ec46722583", "06b9abf013531f38102ae2da3a484e4a9b57f676" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Nov 23 11:02:13 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 23 11:02:13 2022 +0000" }, "message": "Merge \"Clean-up after TZUvA feature removal.\" am: 06b9abf013\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2300422\n\nChange-Id: I1d9b114c135f7e3c80613ae1f7b32346cd0b258f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "06b9abf013531f38102ae2da3a484e4a9b57f676", "tree": "f0874be742b0c9293ef3f0b30a09b51889317981", "parents": [ "bc0e39459f222e600b3091c257221c7f764ce253", "69a5f7df1a53f3e9cb6534ea8d069d629c8b0fee" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Nov 23 10:16:21 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 23 10:16:21 2022 +0000" }, "message": "Merge \"Clean-up after TZUvA feature removal.\"" }, { "commit": "9fdb3eab70f63fac7679eea0ae0c50f2ec2e0bf7", "tree": "8f4c23cb01e173a1e2f525d5a6255f22b987f42e", "parents": [ "44eece0c840f90a1a74607c75c8578df9c057e57", "602bff590b046674be9574b13462a2b0d91eed5f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Nov 19 09:42:06 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Nov 19 09:42:06 2022 +0000" }, "message": "Merge \"Fix \u0027Generic.kl\u0027 file has no \u0027KEYCODE_FOCUS\u0027 mapping\" am: 826b805842 am: 602bff590b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2300377\n\nChange-Id: I3e543d624ac78fd61ca8b52b12a00da8fcbd5170\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "602bff590b046674be9574b13462a2b0d91eed5f", "tree": "6f52854771feeeadc3702ce8814552da4dd34053", "parents": [ "4ab7a43f652b2f5b4f865c973a35be37b32b84f6", "826b805842d954acd3ac54df6df7d2ea536580f8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Nov 19 09:17:10 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Nov 19 09:17:10 2022 +0000" }, "message": "Merge \"Fix \u0027Generic.kl\u0027 file has no \u0027KEYCODE_FOCUS\u0027 mapping\" am: 826b805842\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2300377\n\nChange-Id: I9bb69d71c12344b0790bd649388ea6b3c63964e3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e95a4454a366ba62dafee0d4a4084af352b5fd91", "tree": "74b3cd190407702e1715d8d6caa471eb7217ff36", "parents": [ "4e6ce5ed243430477c594f4d4c59b60cf5f16cb0" ], "author": { "name": "zhangzhihao7", "email": "zhangzhihao7@xiaomi.corp-partner.google.com", "time": "Fri Nov 11 20:04:07 2022 +0800" }, "committer": { "name": "zhangzhihao7", "email": "zhangzhihao7@xiaomi.corp-partner.google.com", "time": "Wed Nov 16 10:20:28 2022 +0800" }, "message": "Fix \u0027Generic.kl\u0027 file has no \u0027KEYCODE_FOCUS\u0027 mapping\n\nThis keyCode is defined in both \u0027keyEvent.java\u0027 and \u0027keyCodes.h\u0027, but not in the Generic.kl file. The comment of \u0027KEYCODE_FOCUS\u0027 says that this keyCode is used for camera focus, so this keyCode should be sent to the camera app, but now he is not in \u0027Generic.kl\u0027.\n\nChange-Id: I2d0a49edae0390c9199efe0f01e527b15d14e68e\nSigned-off-by: zhangzhihao7 \u003czhangzhihao7@xiaomi.corp-partner.google.com\u003e\n" }, { "commit": "69a5f7df1a53f3e9cb6534ea8d069d629c8b0fee", "tree": "a753dc6ec7085c49436793b9111137569164e3c6", "parents": [ "60bcab93678eec400bbdaa53f1b7f3e3d9119165" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Nov 14 14:29:27 2022 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Nov 15 15:19:28 2022 +0000" }, "message": "Clean-up after TZUvA feature removal.\n\nBug: 148144561\nBug: 198740173\nTest: atest FrameworksServicesTest\nTest: m\nChange-Id: I207cb367209a18df318573c95cd18cd9e3a49c18\n" }, { "commit": "973b3adce7698495c5176967406deffe04db7905", "tree": "fa6c32e82d3d5924d235dd4d0928ae1f6b72443a", "parents": [ "95ba64e23f73ffa352879c94029d6a5f4be0eab8", "3dad16a68c21a21785c30a1fd44f3a8199610d82" ], "author": { "name": "Lucas Silva", "email": "lusilva@google.com", "time": "Wed Nov 09 21:43:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 09 21:43:15 2022 +0000" }, "message": "Merge changes Ifece2dc6,Id0c37612 into tm-qpr-dev am: 3dad16a68c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20313650\n\nChange-Id: I6be560ab366bd8bbb6ece691c7e7fbe1af31a358\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3dad16a68c21a21785c30a1fd44f3a8199610d82", "tree": "52b09a98cce9bf2adc768e99b54b7a19fe22aaa0", "parents": [ "6a983b1e8316795d0fe62531b7a7ced12244bf80", "a057442725aed28464cf21b3bfd3fa2767b456cf" ], "author": { "name": "Lucas Silva", "email": "lusilva@google.com", "time": "Wed Nov 09 21:26:27 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 09 21:26:27 2022 +0000" }, "message": "Merge changes Ifece2dc6,Id0c37612 into tm-qpr-dev\n\n* changes:\n Push active dream component to WindowManager instead of pulling.\n Implement alternate power button behavior for dreams.\n" }, { "commit": "a057442725aed28464cf21b3bfd3fa2767b456cf", "tree": "ade451bb76410d96cafe88e72796659d8c9707de", "parents": [ "bffe18bf287807f8cdab3564d8844a8d79df72d0" ], "author": { "name": "Lucas Silva", "email": "lusilva@google.com", "time": "Fri Oct 28 16:03:38 2022 -0400" }, "committer": { "name": "Lucas Silva", "email": "lusilva@google.com", "time": "Mon Nov 07 20:41:10 2022 +0000" }, "message": "Push active dream component to WindowManager instead of pulling.\n\nInstead of pulling the active dream component, we push the component\nwhen a dream is started. This ensures that the active component remains\nin sync with the currently active dream.\n\nBug: 246091760\nTest: flashed device and verified dreams are working correctly\nChange-Id: Ifece2dc62486b74794f0d333d19bec2ab3bc9229\n" }, { "commit": "daaecf4faad898b75f8d2ae48b19b36465d2b7b2", "tree": "1ba694aef9308788bdfd346aa493eac27ce99491", "parents": [ "314f5b050827c20f3c8e3ec187fee1eb09ac48d2", "f66cb50a99bdb6506cab47572d34cafd6984392b" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Fri Nov 04 10:40:55 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 04 10:40:55 2022 +0000" }, "message": "Merge \"Suppress app transition while recents is running\" into tm-qpr-dev am: f66cb50a99\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20335896\n\nChange-Id: I4d1e7c31d45374087032c0c3a11b5dd22c9c4bf8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "67db8072d322e64f8e372636a864016b2d4913f4", "tree": "61e783635762bf08f4ee9e39992af371f4c57919", "parents": [ "1bbb6923934b1e2bb4869e35a6bf7e4a0b16afa0" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Wed Apr 27 15:37:03 2022 +0000" }, "committer": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Wed Nov 02 12:53:29 2022 +0000" }, "message": "Suppress app transition while recents is running\n\nThis fixes conflict between app transition and recents animation in the\nfollowing scenario.\n\n1) App transition animation finishes after app closing animation, which\nis controlled by recents, finishes.\n\nDuring the app closing animation, recents makes the closing app surface\ninvisible, but app transition animation overrides it to visible again.\nThis causes a flicker.\n\n2) App transition starts during recents animation.\n\nWhen a user launches an activity, and immediately after that, swipes up\nthe screen to close the app. Or a user launches an ChooserActivity on\ntop of other activity, and swipes up to move back to home.\n\nWhile recents is running, we assume animation on tasks is controlled by\nrecents, and visibility is commited without animation after recents\nanimation finishes. However starting app transition during recents\nbreaks this assumption, which ends up with playing one more unexpected\nclosing animation (so users see closing animation twice).\n\nThis change also obsolute the logic which exludes launcher activity from\napp transition while recents animation is running, since app transition\nis delayed until recents animation finishes.\n\nBug: 223499269\nBug: 231669960\nBug: 232060413\nTest: atest AppTransitionTest + manual tests\n Test 1\n 1. Launch Gmail app.\n 2. Click icon on the bottom tab (e.g. Chat).\n 3. Swipe up from the bottom (immediately after step 2).\n 4. Verify closing animation only plays once.\n Test 2\n 1. Launch \"Google TV\".\n 2. Play a trailer.\n 3. Full screen and PIP mode switch twice.\n 4. Verify PIP window is shown.\n Test 3\n 1. Change phone to portlait mode.\n 2. Launch Photo app.\n 3. Swipe up from the bottom.\n 4. Verify no rotation animation on the launcher.\n Test 4\n 1. Launch photo app.\n 2. Take screenshot.\n 3. Hit share icon to share the screenshot.\n 4. Swipe up from the bottom.\n 5. Verify photo app closes.\nChange-Id: I264b0daf1118b75fae481f0251ed50b556f27c5f\n" }, { "commit": "151b6249c523d73087b69c028bb08bcee33341f0", "tree": "b1e153d917519aae646da625e540d045d7b4df9d", "parents": [ "acaa100dd8e9e16eb89b9c5468c5bcd67f3b7e1e", "6d1c1b57b45cfd3a38c5ae632ef80cd8caa0051d" ], "author": { "name": "Will Osborn", "email": "willosborn@google.com", "time": "Thu Oct 13 09:19:24 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 13 09:19:24 2022 +0000" }, "message": "Merge \"Allow rotation when display is half-folded\" into tm-qpr-dev am: 6d1c1b57b4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19468929\n\nChange-Id: I24ca34347ee8cb7dfab88d3765a75999be30eee9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "92da83812ccc48d43d671065a76a6ad6f8511d94", "tree": "d1d6fd52d0c0f50d71b2d98301b8357959603166", "parents": [ "f9057965340d398adc846196e5ec4099e80e350e", "a94d90e35dc1a063d102ab6c0a056ccc48469bd2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 11 17:39:41 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 11 17:39:41 2022 +0000" }, "message": "Merge \"Merge tm-qpr-dev-plus-aosp-without-vendor@9129937\" into stage-aosp-master" }, { "commit": "9723cfbc38ba5dc47208584def2711924184a77e", "tree": "c54f3a08706138a789d09b6b923f3559055aa29e", "parents": [ "9a0ed1afe1a4ea2c1e8537196d84c8c958a275d5" ], "author": { "name": "William Osborn", "email": "willosborn@google.com", "time": "Fri Jul 29 16:31:59 2022 +0100" }, "committer": { "name": "William Osborn", "email": "willosborn@google.com", "time": "Mon Oct 10 20:47:26 2022 +0100" }, "message": "Allow rotation when display is half-folded\n\nWhen in \u0027tabletop\u0027 or \u0027book\u0027 mode, allow the display to rotate\neven if it is frozen. Then return to the previously locked rotation when\nthe device is unfolded.\n\nBug: 240146362\nTest: locally tested + ran atest on DisplayRotationTests\nChange-Id: I9869f5b070fecd7df70e08323dfacef8b883f470\n" }, { "commit": "602d511bac5b93d706359ff2c6b1c728ebec1d5d", "tree": "1fd34c6a3ef155d493f7ea8637981322ab78b995", "parents": [ "3d794a3a66c27fb0fceddceadcba807e8a675288", "a7e087d1c8ad53542fbc53dc1ab0af6f957efbf1" ], "author": { "name": "Hyein Yu", "email": "hyeinyu@google.com", "time": "Fri Oct 07 03:09:13 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 07 03:09:13 2022 +0000" }, "message": "Merge \"Add FULL_ACCESS_CELL_BROADCAST_HISTORY permission to shell for CellBroadcast MTS test.\" am: 70d864fbf1 am: a7e087d1c8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2228942\n\nChange-Id: I9ba3595d7fd44d238ddaad8ba183cbeaa866b85c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7f0ea0a6ad7b0fcb41d57ba393f841853b2beed4", "tree": "7402ddbdba32b69e6c003742faacea72a5e6dc45", "parents": [ "13db8fd5707b3c1c1484d717da8bda73ee7090a6" ], "author": { "name": "Hyein Yu", "email": "hyeinyu@google.com", "time": "Mon Sep 26 02:23:36 2022 +0000" }, "committer": { "name": "Hyein Yu", "email": "hyeinyu@google.com", "time": "Mon Sep 26 06:18:26 2022 +0000" }, "message": "Add FULL_ACCESS_CELL_BROADCAST_HISTORY permission to shell for CellBroadcast MTS test.\n\nGrant FULL_ACCESS_CELL_BROADCAST_HISTORY permissions to the shell identity for use within CellBroadcast MTS tests.\n\nBug: 236217191\nBug: 227422973\nTest: atest com.android.cellbroadcastreceiver.compliancetests.CellBroadcastConfigTest\nChange-Id: Ief5a4c168968b4dc8c9cf7cc071618d41c23d220\n" }, { "commit": "b6fa124dc98e5bbbd10735a8365c9651d69454e7", "tree": "b1cb5053438b966a3c1556ff672a0c998592362e", "parents": [ "963f7ec6f8a8d3b6e679ea67fff56f85b9caf935", "591f54ba80b4a8da6bcf1f0e3e91c0e8e15a4bed" ], "author": { "name": "Lucas Silva", "email": "lusilva@google.com", "time": "Thu Sep 22 15:36:50 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 22 15:36:50 2022 +0000" }, "message": "Merge \"Add additional logging to dream enforcement logic to debug failures.\" into tm-qpr-dev am: 591f54ba80\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970255\n\nChange-Id: Iba9816ef1e6db30c5228589e6a77a5f5b9ef0f32\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ec702b7b0c1139b2205da35f6fa6f6386d2c693", "tree": "00c0f1dd7a6f65545179676d597d5903b4b7097d", "parents": [ "0b180ddbed4d5fa79f6f76d1863bb9eebf00bf54" ], "author": { "name": "Lucas Silva", "email": "lusilva@google.com", "time": "Fri Sep 16 11:52:17 2022 -0400" }, "committer": { "name": "Lucas Silva", "email": "lusilva@google.com", "time": "Tue Sep 20 00:49:57 2022 -0400" }, "message": "Add additional logging to dream enforcement logic to debug failures.\n\nBug: 246091760\nTest: n/a\nChange-Id: I171225b28e0661bf0a0b1b0ef6bdb3a4e85f64ea\n" }, { "commit": "929e5378a00191f468650e01d3e0903d8efd2800", "tree": "3ebb8e0d7eab54b36972fad65c7c35f575501e7b", "parents": [ "65423055b011b2d42ee5023d42e7eddc598f8dc9", "d0208d9292d8e400cd3bbf145eaf2d08093c0474" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Wed Sep 07 05:31:19 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 07 05:31:19 2022 +0000" }, "message": "Merge \"Collect embedded TaskFragment window changes\" into tm-qpr-dev am: d0208d9292\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19561152\n\nChange-Id: If22315d886a178ffd74f0a60b21548ac9ab24f30\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d00861c46efc71ca6b1fe2bcb010b71b39b99085", "tree": "4efe6d9b6e19a18b1f2fb79f82005d207dc1b570", "parents": [ "fc9ccbb8a0ac6071ca8413dfc17d28c9e1207a9e" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Aug 29 16:36:49 2022 +0800" }, "committer": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Wed Sep 07 08:54:57 2022 +0800" }, "message": "Collect embedded TaskFragment window changes\n\nTo make sure the embedded TaskFragment surface will be updated when\nShell transition is enabled.\n\nBug: 207070762\nTest: testApplyTransaction_collectTaskFragmentBeforeApplyChange\nChange-Id: Id726b67cd30bd68e3ca4bc2665ab0a9024d76dab\n" }, { "commit": "85167f847598d2bb6ec42ab686c9d2a33b8ea9fe", "tree": "491869682fecbb7dd03983238b5c48476017eaa3", "parents": [ "1ea3a6fedc637d8be60436e3f522708352c5e664", "2c9b75902eeb545d3328f4ba579c3de505f99346" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Thu Sep 01 07:22:46 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 01 07:22:46 2022 +0000" }, "message": "Merge \"Add TaskFragmentOrganizer#applyTransaction with request transition\" into tm-qpr-dev am: 2c9b75902e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19714429\n\nChange-Id: I3225c3c79b0a309e9e16abd2f81b92e263a55a90\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2c9b75902eeb545d3328f4ba579c3de505f99346", "tree": "3f2b5340fa1ee145f2d308747d4f72d503dcabb0", "parents": [ "ff778d202306b04710230077d41e04b67e4019af", "dc7cb3659d21093f3fc6a0b7b242bf1f743d3c67" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Thu Sep 01 06:59:10 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 01 06:59:10 2022 +0000" }, "message": "Merge \"Add TaskFragmentOrganizer#applyTransaction with request transition\" into tm-qpr-dev" }, { "commit": "dc7cb3659d21093f3fc6a0b7b242bf1f743d3c67", "tree": "960e1bcb938fa8d0740e8b9acbbea992303e6bb6", "parents": [ "907c1ad88d65af7550a255c6ba9ebc8321acb5a5" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Aug 22 12:04:37 2022 +0800" }, "committer": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Thu Sep 01 12:00:31 2022 +0800" }, "message": "Add TaskFragmentOrganizer#applyTransaction with request transition\n\nInstead of having WM Core to \"guess\" when to request transtiion, let the\norganizer to tell whether or not it needs to be applied immediately.\n\nWith the shouldApplyIndependently parameter, we can make sure the future\nruntime API to change split layout won\u0027t affect other ongoing\ntransition.\n\nBug: 207070762\nTest: atest WmTests:TaskFragmentOrganizerControllerTest\nChange-Id: I658b0ba1ae9decc741f09cb53bfff2c45ea076a0\n" }, { "commit": "1840a685d6b8f8e9d664b6e4dc37dccf1c355f40", "tree": "d2875d6194996d9cede0de883660b572ed298861", "parents": [ "a2e9019b6dc6dd10a2f31e0eba31e6200d963d1b", "4597b40d49a108322659893cdb1d6b1c9328cf53" ], "author": { "name": "Antony Sargent", "email": "asargent@google.com", "time": "Wed Aug 31 23:39:27 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 31 23:39:27 2022 +0000" }, "message": "Merge \"Make FLAG_KEEP_SCREEN_ON use per-display wakelocks\" into tm-qpr-dev am: 4597b40d49\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19535194\n\nChange-Id: Ife247add36251dde408568d7cdf6caa0cb3a13b6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "62aecf34aab20486b78202d15ab070434fdaeafe", "tree": "da7499f49205c0b7f4ad3c8b620a55c181f8b979", "parents": [ "77338a2cf48e558d312a372344e4e88402ade71d" ], "author": { "name": "Antony Sargent", "email": "asargent@google.com", "time": "Thu Apr 14 14:33:38 2022 -0700" }, "committer": { "name": "Antony Sargent", "email": "asargent@google.com", "time": "Wed Aug 31 10:21:35 2022 -0700" }, "message": "Make FLAG_KEEP_SCREEN_ON use per-display wakelocks\n\nThis moves from having a single global wakelock held by\nWindowManagerService whenever any window on any display has\nFLAG_KEEP_SCREEN_ON set, to having one per DisplayContent that is only\nheld when a window on that Display has the flag set.\n\nBug: 185157739\nTest: atest WmTests\nChange-Id: I82dcb693ad2bea0a243be4299dae836a1f53930c\n" }, { "commit": "154a6a50b7a07d108b21fc880c2c5e60173920ae", "tree": "0b2ece1e30a018be1ffaa5a5ff36bfe2d66419ef", "parents": [ "d4357de0eb8326f109857141554c39854f87a641", "16219f2ea4ca3e1164d6de44a8c3e6e7ec30c119" ], "author": { "name": "Jenhou (Alan) Huang", "email": "alanjhhuang@google.com", "time": "Tue Aug 30 05:43:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 30 05:43:38 2022 +0000" }, "message": "Merge \"[VolumePanel] Move the Settings\u0027 volume panel into a SystemUIDialog\" into tm-qpr-dev am: 16219f2ea4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19482609\n\nChange-Id: I51953caf99f845431d7ceeb7fd102aef308b2837\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e03186af0e9e5a4c23ef0a7b5ab4a98121212d0e", "tree": "e09e7483b64725c84ef2e5f943703c3c8f008fd2", "parents": [ "f2826d867b50a897dd1b34b5950660a90171b160" ], "author": { "name": "Alan Huang", "email": "alanjhhuang@google.com", "time": "Wed Apr 27 13:25:27 2022 +0000" }, "committer": { "name": "Alan Huang", "email": "alanjhhuang@google.com", "time": "Mon Aug 29 18:59:51 2022 +0000" }, "message": "[VolumePanel] Move the Settings\u0027 volume panel into a SystemUIDialog\n\nMove most of the logic of the Settings\u0027 volume panel to a SystemUIDialog\nto make the dialogs consistent with other system dialog.\n\nBug: 202262476\nTest: manual build and launch the new dialog.\nChange-Id: Ic27dcca77072dee2b78827e1eb58c28022b47265\n" }, { "commit": "5c4bf7353242322f268ff58d539b69f340ab2062", "tree": "283d320243b706c6d5888893f3496913777330bb", "parents": [ "9f431fa78ccb62dc8c9f3a8294daf19d5f1fdd87", "bd4b118acbab4f6330b747e03af4a51da6d1bc64" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Fri Aug 26 01:45:26 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 26 01:45:26 2022 +0000" }, "message": "Merge \"Fix crash when continueTransitionReady without collecting transition\" into tm-qpr-dev am: bd4b118acb\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19728246\n\nChange-Id: I7178f73f49ec4529940e1b9fb85309a174a4ea27\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd4b118acbab4f6330b747e03af4a51da6d1bc64", "tree": "7b80bb07e4ec29a4a64157713d535590b2b999cd", "parents": [ "28ecf3e17d9037777e8fe0d5ae494b1689ca8c8d", "5ce3e5d6612a5b921c9975b71d770e793f9d2d0a" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Fri Aug 26 01:38:31 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 26 01:38:31 2022 +0000" }, "message": "Merge \"Fix crash when continueTransitionReady without collecting transition\" into tm-qpr-dev" }, { "commit": "cc1aa40eac4f04a6ea07bfa5b4bfdeff27ebddbf", "tree": "a4e667213ae0991c3a6fecfd84b343c779a02442", "parents": [ "ebef23717583694a519c768373251c9bbdd185b5", "0626b32460864be12a9a831ac14bcc4e11836d63" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Thu Aug 25 16:36:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 25 16:36:57 2022 +0000" }, "message": "Merge \"Restrict readability of uid state changes so that uid states of other users uids are not exposed to those that do not have permission.\" into tm-qpr-dev am: 0626b32460\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19646036\n\nChange-Id: I37189e1d23e75dbd2f31733825674a47773e01a7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0626b32460864be12a9a831ac14bcc4e11836d63", "tree": "2e690d1324d3d9f8fef6f31e700514c37f483d9a", "parents": [ "469cbe9037790ea228d44eeeec4e1094c0b7399f", "4a06c40b87e953a39e3fe921d3b2750ba4530a42" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Thu Aug 25 16:29:53 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 25 16:29:53 2022 +0000" }, "message": "Merge \"Restrict readability of uid state changes so that uid states of other users uids are not exposed to those that do not have permission.\" into tm-qpr-dev" }, { "commit": "5ce3e5d6612a5b921c9975b71d770e793f9d2d0a", "tree": "0d18aecb79d2d8cea0b5cc9f622aeae9bc22c882", "parents": [ "38a3a662784aca77a5f5fb287876dfe9a6fbbf7a" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Wed Aug 24 12:01:25 2022 +0800" }, "committer": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Thu Aug 25 10:12:34 2022 +0800" }, "message": "Fix crash when continueTransitionReady without collecting transition\n\n1. When deferTransitionReady is called, it should un-ready the sync\n group.\n2. Do not call continueTransitionReady when the transition is no\n longer collecting, such as transition timeout or abort.\n\nBug: 207070762\nTest: atest WmTests:TransitionTests\nChange-Id: I33a211d574da54ed220c7d0f7c12e201c5e1f681\n" }, { "commit": "f4d5421fc2be86511ed55a83f4a1c2e05a109e5d", "tree": "345ad51e5de12aa7642eabdeb431845aef165869", "parents": [ "888808b391af252360206d884ae50f5f86765abf", "f2e3e58c55fcc42337a230a7ec98c3e4014d09da" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Wed Aug 24 23:32:47 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 24 23:32:47 2022 +0000" }, "message": "Merge \"Add a non-blast mode to sync-engine\" into tm-qpr-dev am: f2e3e58c55\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19453502\n\nChange-Id: Ib9005e82cd084d2e08f2bf6191fb006e4e664a12\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2e3e58c55fcc42337a230a7ec98c3e4014d09da", "tree": "8c933cbc53f7da31a0472324fbf95dbeca6e5ff4", "parents": [ "bca9adf5b26e7c270d9e4ccc7e4a79032d29465c", "9110a8af742af44e490548b129df282a20ee1ecb" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Wed Aug 24 23:12:36 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 24 23:12:36 2022 +0000" }, "message": "Merge \"Add a non-blast mode to sync-engine\" into tm-qpr-dev" }, { "commit": "cbe2a51d60e0487c5e5bc79b7c73d02c78ff2884", "tree": "8c40f0edddf11c6102bf3fb874eee689b1600185", "parents": [ "e16a86cf1c82f35fd86c230e4e6fa07ddcb55634", "92aa9080eb1fa02c2a74841b26d565eea33aa9f1" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 24 14:40:58 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 24 14:40:58 2022 +0000" }, "message": "Merge \"Require CONFIG_HID_PLAYSTATION for DualSense key layout\" into tm-qpr-dev" }, { "commit": "570d249c9cf1e6ec04edadc2323bd561abd2dcc6", "tree": "f600f561a29884b2e1425421151e1555258afa53", "parents": [ "0859d1505d69347e3c3232ce7fd2830adcad1630", "3294ef42e4f0d7a1b2472ab22b9374f0a2d05561" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Wed Aug 24 01:11:14 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 24 01:11:14 2022 +0000" }, "message": "Merge \"Wait for TaskFragmentOrganizer to finish handling transaction\" into tm-qpr-dev am: 3294ef42e4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19564031\n\nChange-Id: I55787b4ac6e4018b19ad03d33ca9e86e5ac000e1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9110a8af742af44e490548b129df282a20ee1ecb", "tree": "3dce1ec3fd839687d63ea9b2c0b469bd43afe84d", "parents": [ "c24db189bfb083ce2cae6c83d80d70e6cf810e65" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Mon Jul 18 15:24:53 2022 -0700" }, "committer": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Tue Aug 23 16:51:43 2022 -0700" }, "message": "Add a non-blast mode to sync-engine\n\nThis adds a \"method\" to sync-engine where an app just draws\ninternally and reports (no sync).\n\nThe transition system can then use this to implement its own\nscreenshot-based sync mechanism. For now, this uses legacy logic\naround \"changeTransition\" to decide which levels to take\nscreenshots at (since screenshots are slow).\n\nThis also adds a per-window method override to handle situations\nwhere one window/sub-hierarchy needs to use or not-use a\nmethod (specifically, seamless-rotation needs BLAST even if\nthe rest of the transitions are screenshot).\n\nBug: 242056267\nTest: atest TransitionTests SyncEngineTests\nChange-Id: Iee6ee85bafb8967e2e1e662cd3275fba1efbbdea\n" }, { "commit": "4e9c5b44b1f2effbd3c1450ef7887d614349d7ff", "tree": "2602f51cfa39750e4ed5983c77a90c10aa81aef7", "parents": [ "c3cad7c7f31c363ddd2ef889ea60921a283694d3" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Tue Aug 09 13:51:10 2022 +0800" }, "committer": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Tue Aug 23 09:46:05 2022 +0800" }, "message": "Wait for TaskFragmentOrganizer to finish handling transaction\n\nWhen a TaskFragmentTransaction is sent to the organizer during a\ntransition, have the transition wait for the organizer to finish\nhandling the transaction.\n\nBug: 207070762\nTest: atest WmTests:TaskFragmentOrganizerControllerTest\nChange-Id: I4b7955171cd8ce386686ff2cd64b7c04a6436ddf\n" }, { "commit": "92aa9080eb1fa02c2a74841b26d565eea33aa9f1", "tree": "2ff6328239b7ddb3aafbf8bc0a4fbb98a0689a29", "parents": [ "08990cade2d15b668e06007200803be63dace7d4" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed May 18 13:34:55 2022 -0700" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Tue Aug 23 01:23:29 2022 +0000" }, "message": "Require CONFIG_HID_PLAYSTATION for DualSense key layout\n\nSome olders kernels don\u0027t yet support HID_PLAYSTATION. While they are\nworking on supporting this driver, provide this temporary solution.\n\nBefore this patch, if the key layout is loaded, but there is no\nHID_PLAYSTATION, then the mappings on the device will be incorrect.\n\nWith this patch, this key layout will not be loaded unless there is a\nCONFIG_HID_PLAYSTATION enabled on the device.\n\nInstead, when the main layout cannot be loaded, we make another attempt\nto load a fallback layout. This way, the mappings on DualSense can be\ncorrect even if the HID_PLAYSTATION module is not loaded.\n\nIn this CL, the fallback layout was tested using controllerTester.\n\nBug: 228005926\nTest: tested mappings with a DualSense controller on a device that does\nnot have CONFIG_HID_PLAYSTATION\n\nChange-Id: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f\n" }, { "commit": "4a06c40b87e953a39e3fe921d3b2750ba4530a42", "tree": "b272a38a524f9a459c334337bb3650eeeadbcf95", "parents": [ "bef8a5be14eb744c4be91fd22a0e7d15cb4552e9" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Tue Jul 12 22:28:45 2022 +0000" }, "committer": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Aug 17 17:07:32 2022 +0000" }, "message": "Restrict readability of uid state changes so that uid states of other users uids are not exposed to those that do not have permission.\n\nTest: manual test\nBug: 217934898\nChange-Id: I3f52d4ca32c22c54fa9b1663954a43b44d9000a0\nMerged-In: I3f52d4ca32c22c54fa9b1663954a43b44d9000a0\n(cherry picked from commit c69aa1be70009c10e76196f71023f229cc667b7a)\n" }, { "commit": "56e0f4a61d271f31f101913df09a1e14d6dffddb", "tree": "45b80b4364f9d9a6103a8eee9f58beb374472bf1", "parents": [ "997ef747082cfc1ad2c8ba20c6ee3dd1fc764319", "f5a7752bf27bb78e6ba0070ac429ccd41b966573" ], "author": { "name": "Naomi Musgrave", "email": "nmusgrave@google.com", "time": "Fri Aug 12 11:00:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 12 11:00:56 2022 +0000" }, "message": "Merge \"[Partial Screenshare] Respond to task changes\" into tm-qpr-dev am: f5a7752bf2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570090\n\nChange-Id: If3ba9ede80fc52a1a5d85604d947b05bb4e8f4d7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0d9ba1c04a89a8849030356efc3b4e506ba3553f", "tree": "71e3af76ace32146b352570c9f4bd20405511919", "parents": [ "65ca888c567513b3deb010c307a44f1eb41afe4e" ], "author": { "name": "Naomi Musgrave", "email": "nmusgrave@google.com", "time": "Wed Jul 06 09:09:44 2022 +0000" }, "committer": { "name": "Naomi Musgrave", "email": "nmusgrave@google.com", "time": "Thu Aug 11 18:03:53 2022 +0000" }, "message": "[Partial Screenshare] Respond to task changes\n\nDestroying the MediaProjection notifies the client app through the\nMediaProjection callbacks that the app should handle the session\nending prematurely.\n\nThis may happen if setting up task recording failed, or if the\nuser exited the task that is being recorded.\n\nRegistering a listener to the task for configuration changes\nalso enables handling of the task entering/exiting split\nscreen.\n\nFixes: 219761722\nFixes: 237526949\nFixes: 236971595\nTest: atest WmTests:ContentRecordingControllerTests\nTest: atest WmTests:ContentRecorderTests\nChange-Id: I415fb70433a031889f0486e99bb7d3b664333414\n" }, { "commit": "96986f64dfc6f81e3715167bf08d8e5ee8ad3ffe", "tree": "d651db86f073026eb19e1d04978183a784fa70a8", "parents": [ "dc308a9d43d67e3781b89cda91eefbecf268efee", "3544e25a4e314622e49b55154ec4ae00c1f35c4f" ], "author": { "name": "Yanli Wan", "email": "yanliwan@google.com", "time": "Wed Aug 03 19:30:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 03 19:30:00 2022 +0000" }, "message": "Merge \"Stop app pinning if lock task is requested from allowedlisted app\" into tm-qpr-dev am: 3544e25a4e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19461336\n\nChange-Id: I8546e339d3627dc8d3df4cf8e58064ae2628a1fe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3544e25a4e314622e49b55154ec4ae00c1f35c4f", "tree": "9fa377d7b431b9c9657d49356e0a439bc5f291ea", "parents": [ "110cd7aa33031afaaf36654629e96eda4148870e", "540a7c32d856f9513ea26ffc4c2b9327f5a3a1b5" ], "author": { "name": "Yanli Wan", "email": "yanliwan@google.com", "time": "Wed Aug 03 19:18:52 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 03 19:18:52 2022 +0000" }, "message": "Merge \"Stop app pinning if lock task is requested from allowedlisted app\" into tm-qpr-dev" }, { "commit": "12cc95ad183ee88ac26574c8b7b4fd1814bb6f03", "tree": "59865e5411c1e1e71f33d093e818c84530de1a34", "parents": [ "cd5b8e72eecbc65b4d6877dc5077eab81c50ad7a", "447919823cfb185f6bc8ab30b593e2519a095fa7" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Wed Jul 27 06:55:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 27 06:55:37 2022 +0000" }, "message": "Merge \"Fix open ActivityEmbedding split with Shell transition\" into tm-qpr-dev am: 447919823c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19321172\n\nChange-Id: Ia471a71ba97cf89fa8c214734012075a9b1a33c5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0dfebbe4d711d80ae16aa99be2d5c80e1b5fa963", "tree": "819d1145f59e716899724a5aa4c2925e2609faa7", "parents": [ "bbb516199e96b0eed7a56c6ad31a17d0e4465db6" ], "author": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Mon Jul 18 17:29:57 2022 +0800" }, "committer": { "name": "Chris Li", "email": "lihongyu@google.com", "time": "Wed Jul 27 01:30:52 2022 +0000" }, "message": "Fix open ActivityEmbedding split with Shell transition\n\n1. Collect the TaskFragment when reparenting an activity into it.\n2. Check adjacent TaskFragment for transition flag FLAG_TRANSLUCENT.\n3. Offset the relative position for default animation.\n\nBug: 207070762\nTest: pass existing\nChange-Id: I62b533dbb087007e3ef126170691a59929eb75e1\n" }, { "commit": "d1525033ca8883803252675398cdb520f52464db", "tree": "046c3414c360fd45847126ba5145eff21089f068", "parents": [ "ce2d68939225a9015aa9183b5964cb8b4a6d648c", "e5dc49d4bf4714c1e733c86147309b39fc15ead7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 21 03:54:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 21 03:54:32 2022 +0000" }, "message": "Merge \"Revert the line of NotoSansLao post script name\" into tm-qpr-dev am: e5dc49d4bf\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19330066\n\nChange-Id: I4934a3921d6970f4d7318ab49da95abfd41f7c2b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "540a7c32d856f9513ea26ffc4c2b9327f5a3a1b5", "tree": "d2be3782fb46ba3cbf342cb7bb501f7b5ce75a35", "parents": [ "7d3188b7c3a8608d93c369d976d4a1437f5945e7" ], "author": { "name": "Yanli Wan", "email": "yanliwan@google.com", "time": "Tue Jul 19 11:54:10 2022 -0700" }, "committer": { "name": "Yanli Wan", "email": "yanliwan@google.com", "time": "Tue Jul 19 16:11:23 2022 -0700" }, "message": "Stop app pinning if lock task is requested from allowedlisted app\n\nBug: 213942596\nTest: Manual\nChange-Id: I86c71bef4f8c374fab01aa0a5f3997ba1a2b27cf\n" }, { "commit": "5b949326268f75e993ee36061fdc540063b115bd", "tree": "c3e949d1f148164248dda01030d267a1c5315c0f", "parents": [ "fecc3b13390952b9eab87c84e8b34612d2cced4c" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Mon Jul 04 14:02:03 2022 +0900" }, "committer": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Tue Jul 19 00:35:39 2022 +0000" }, "message": "Revert the line of NotoSansLao post script name\n\nBug: 235922054\nTest: N/A\nChange-Id: I4af08ba06d12afdf0753f07b4a757d9dd89df3bb\n" }, { "commit": "c20b2f0e407577ad3ee428a0b53b233b526b18e0", "tree": "cbcfa9772839be52492b8eec46edc741b5368fdf", "parents": [ "520e69b92c0a193ff33c743db8146979acf9aba5", "45b540163a253e1e6afcd5d34db61457248dece5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 11 20:00:53 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 11 20:00:53 2022 +0000" }, "message": "Merge \"[Shell-Transition] clean-up some isAnimating call points\" into tm-qpr-dev am: 45b540163a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19086047\n\nChange-Id: I19ba26b0f40a0edc0076191db1214d751401a537\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ae2fbd47a00b4c00d3081e674832f16131339254", "tree": "9d32423eefdba105cb6c6d2974ba792f1f666b11", "parents": [ "de765a95ea981b7b578c976c67ad8907448687df" ], "author": { "name": "Ming-Shin Lu", "email": "lumark@google.com", "time": "Mon Jun 27 16:45:29 2022 +0000" }, "committer": { "name": "Ming-Shin Lu", "email": "lumark@google.com", "time": "Mon Jul 11 13:12:34 2022 +0000" }, "message": "[Shell-Transition] clean-up some isAnimating call points\n\n..to reflect the app transition animating state when shell-transition\nenabled for below cases:\n\n1) ImeInsetsSourceProvider#isReadyToShowIme will use WS#isClosing -\u003e\n AR#isClosingOrEnteringPip to check if the IME layering target window\n is in closing transition. (i.e. It won\u0027t be ready to show IME while\n the target is in closing app transition.) Also, given isClosing and\n isClosingOrEnteringPip currently is only used for checking IME target\n validity, wraping those logic into isImeTargetWindowClosing() for\n simplicity.\n\n2) With Shell-Transition, the activity will running a transition when\n it is visible, it won\u0027t be included when fromTransition is true means\n the call from finishTransition. As a result, in AR#commitVisibility,\n callback onAppVisibilityChanged(visible, runningAppAnimation) with\n using the above checking logic and adding logs for tracking. In case\n a11y controller will always callback onWindowTransition with\n TRANSIT_EXIT due to runningAppAnimation always being false by\n isAnimating no-op.\n\nFix: 212570341\nTest: No visible change \u0026 Pass existing tests.\nChange-Id: I9cc77956b3ff61ae83f5bd120c395cc6aca93af9\n" }, { "commit": "54c07fc4dc3625e9feaf344b3918dcf016356455", "tree": "8d9924ec62d1e44d9c45d3753405d21fd07d573f", "parents": [ "bd58f61bc125ea62f2e557bf564471dddd584eac", "be9d1c782109a4a69a49ca77a1231b3b2daa7ce3" ], "author": { "name": "Louis Chang", "email": "louischang@google.com", "time": "Tue Jun 28 01:54:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 28 01:54:30 2022 +0000" }, "message": "Merge \"Skip moving the focused Task to top if it is already on top\" into tm-qpr-dev am: be9d1c7821\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19009471\n\nChange-Id: I19157321cb39c5db23c2cc18705cd26b40a2062b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "290a8afc9d658dc57632324d6de727fecfa5ff2e", "tree": "3e85d8a345eba791767df9d64647efc259b01a8e", "parents": [ "c3acd4a2791792046df382e5391e82ce3aba4580", "813c1e83a3ba38e1753b02a74bdaba08f1cc811f" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Tue Jun 28 01:49:28 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 28 01:49:28 2022 +0000" }, "message": "Merge \"Drop sync buffers for subsequent sync requests\" into tm-qpr-dev am: 813c1e83a3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18718883\n\nChange-Id: I56b68336f40f4c59e4b446c255568fb9cbd06ad3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "be9d1c782109a4a69a49ca77a1231b3b2daa7ce3", "tree": "5ad99c9681f87f0f490df10e868c3b48cd70e96d", "parents": [ "8d296990a643afbd0e0aaf6d8c8829fffde8cde1", "9b71e4551cef015b3ccc40e65f0d7ee14d9bb257" ], "author": { "name": "Louis Chang", "email": "louischang@google.com", "time": "Tue Jun 28 01:17:30 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 28 01:17:30 2022 +0000" }, "message": "Merge \"Skip moving the focused Task to top if it is already on top\" into tm-qpr-dev" }, { "commit": "b9876970422a640fd764b83862d615eb5b693d8e", "tree": "85a7d276ddc2f66842b02f6e92e04307a8782e0a", "parents": [ "0d61ab9e5d21b62ec471b90e8883190ccf4e5444" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Thu May 26 16:40:33 2022 -0700" }, "committer": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Mon Jun 27 10:45:16 2022 -0700" }, "message": "Drop sync buffers for subsequent sync requests\n\nWhen making subsequent draw requests for the same window, drop\nany existing buffers since they will be replaced by the new one.\n\nSometimes the \"old\" buffer will still be \"in-flight\" (either\ndrawing still or in binder). So, also drop incoming buffers\nfor seqIds that are earlier than the latest prepareSync.\n\nAdditionally, immediately apply any applyWithNextDraw that were\nrequested before the sync, but arrive after the sync started --\notherwise they can get put on pending (which waits for sync\napply) and thus also block the buffer queue.\n\nBug: 233625646\nTest: run tests and check for ANRs\nChange-Id: I156a9a73eea8346dc241b5d782a863b99127ca9f\n" }, { "commit": "9b71e4551cef015b3ccc40e65f0d7ee14d9bb257", "tree": "cb4dacc141a0e7fae4a568734ea444348fa075a5", "parents": [ "acc2838241d27891414b3830fc68f544959ecb70" ], "author": { "name": "Louis Chang", "email": "louischang@google.com", "time": "Wed Jun 22 04:41:14 2022 +0000" }, "committer": { "name": "Louis Chang", "email": "louischang@google.com", "time": "Fri Jun 24 05:31:12 2022 +0000" }, "message": "Skip moving the focused Task to top if it is already on top\n\nThe Task was moved to front while making an Activity to be the\nfocused app. In that case, the resumed activity will be reset\nto the top-most resumed activity in the Task.\n\nHowever, the top-most resumed activity in the Task should not\nalways be the current focused activity when activity embedded.\n\nThis CL skips unnecessary task movement and making the target\nactivity to be focused if the task is already on top and focused.\n\nBug: 236565088\nTest: atest TaskFragmentTest\nChange-Id: I6cbea10bdfa422e9d51c051595ed592843f5ba79\n" }, { "commit": "e6c3b55f4fe3b10492ed315b553886e8d07c4b89", "tree": "32b1efb9a74aaf8e44b4a4dfa728061e3821fa81", "parents": [ "65987459355505e0929c9d35e18316a17ed1123a", "294dad862e3ccc9f09fe2fcfde8d3cb80a2494cb" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 17 20:03:44 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 17 20:03:44 2022 +0000" }, "message": "Merge \"Require CONFIG_HID_PLAYSTATION for DualSense key layout\" into tm-dev-plus-aosp am: 6ea7f6c7b0 am: 294dad862e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18930751\n\nChange-Id: Id5aaf65e32525e74c8d15c91e06ebcc87996a5ff\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8169da18d8f14a07cfa23ee6fed1cbe13c064a34", "tree": "04c747a70866709430352458809a409ec2d0c35b", "parents": [ "3e40b22290804addd00af30812bb51c8036aa5ba" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed May 18 13:34:55 2022 -0700" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Thu Jun 16 17:34:37 2022 +0000" }, "message": "Require CONFIG_HID_PLAYSTATION for DualSense key layout\n\nSome olders kernels don\u0027t yet support HID_PLAYSTATION. While they are\nworking on supporting this driver, provide this temporary solution.\n\nBefore this patch, if the key layout is loaded, but there is no\nHID_PLAYSTATION, then the mappings on the device will be incorrect.\n\nWith this patch, this key layout will not be loaded unless there is a\nCONFIG_HID_PLAYSTATION enabled on the device.\n\nInstead, when the main layout cannot be loaded, we make another attempt\nto load a fallback layout. This way, the mappings on DualSense can be\ncorrect even if the HID_PLAYSTATION module is not loaded.\n\nIn this CL, the fallback layout was tested using controllerTester.\n\nBug: 228005926\nTest: tested mappings with a DualSense controller on a device that does\nnot have CONFIG_HID_PLAYSTATION\n\nChange-Id: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f\nMerged-In: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f\n" }, { "commit": "5a6c0e78026880b9c669ae6cffae09b90ee372b2", "tree": "12c036c459607835bc59030662b15be8aa9e34ae", "parents": [ "5018b05d6d144be4afcbb09ef146719994f95ca9", "f1223c1738484c6ee6429aa0e94fd488c4f6a1e3" ], "author": { "name": "Jimmy Chen", "email": "jimmycmchen@google.com", "time": "Thu Jun 16 01:55:28 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 01:55:28 2022 +0000" }, "message": "Merge \"p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test\" am: 1bf4072c78 am: a29505af31 am: a6b28ca5eb am: f1223c1738\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115076\n\nChange-Id: I794b9eb7a6172c466175521a1c944f0120882143\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6b28ca5ebd25840ee5f2e7d940cb259337747bb", "tree": "a48e199b7349cb6d0cf62c00a34dd4aeaae932b8", "parents": [ "b8e3ad6eae69b82e4b3f415ff771296692c75ee1", "a29505af31abbd3b54ef7ce2e82b3e145f073b0d" ], "author": { "name": "Jimmy Chen", "email": "jimmycmchen@google.com", "time": "Thu Jun 16 01:44:21 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 01:44:21 2022 +0000" }, "message": "Merge \"p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test\" am: 1bf4072c78 am: a29505af31\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115076\n\nChange-Id: Id14c36a6cdfc6b01e97846c38238f14fc231cfe0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a29505af31abbd3b54ef7ce2e82b3e145f073b0d", "tree": "4067f400b79658e2c0a7c7b74d261f76f537cdc7", "parents": [ "33f967da8f822d2755ed54f524b35556a602fd01", "1bf4072c780377cd7cd5f7bf645084c729697aec" ], "author": { "name": "Jimmy Chen", "email": "jimmycmchen@google.com", "time": "Thu Jun 16 01:18:58 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 16 01:18:58 2022 +0000" }, "message": "Merge \"p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test\" am: 1bf4072c78\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115076\n\nChange-Id: Ifc3ffd42afdfdd3c887251484490661a5100b02e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f46b780f16c6c0fe0a2e5ecfbd2d03ca1977457a", "tree": "68ba7cb8ea446d9553ca23ab3e588b30b754dce9", "parents": [ "ed2fdc4d51db2ba7a8540fb8c470d945ab6778da" ], "author": { "name": "Jimmy Chen", "email": "jimmycmchen@google.com", "time": "Thu Jun 02 18:34:24 2022 +0800" }, "committer": { "name": "Jimmy Chen", "email": "jimmycmchen@google.com", "time": "Wed Jun 08 15:38:18 2022 +0800" }, "message": "p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test\n\nBug: 230699791\nTest: atest android.net.wifi.cts.ConcurrencyTest#testP2pSetWfdInfo\nChange-Id: Ic25dc6d7b18bad38863acfd32d839155da28141b\n" }, { "commit": "72a27f37ef850da76032d52e6aa24c74e0d9f17c", "tree": "838dec6051012275eaaf2210806864f8f699974c", "parents": [ "fe7e4cb0b2f7a88488c77596e00cd1024eb979a5", "bdaf705b8a5d17aca850aa251775d3c6d2528b88" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Tue May 31 19:28:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 31 19:28:38 2022 +0000" }, "message": "Merge \"Exclude launcher from app transition animation while recents is running.\" into tm-dev am: 0dfb582d5a am: bdaf705b8a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492309\n\nChange-Id: I7ae2a50abaa1d16102a4f528cb1d8790445ed316\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2a46a89edc1ff77125022ccb1639351aae6fed0f", "tree": "ec64361677f1d880f8cc7041e1dae6dba3d632aa", "parents": [ "74881b6cd6d2ec11e362cb64e07e3337cf1343e9", "4e64cb2050cea8fa414b45284c7b6b5f8bb2d3db" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 31 16:48:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 31 16:48:02 2022 +0000" }, "message": "Merge \"Merge \"Exclude launcher from app transition animation while recents is running.\" into tm-dev am: 0dfb582d5a am: 6b153ac88f\" into tm-d1-dev-plus-aosp am: 4e64cb2050\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492309\n\nChange-Id: Ifb0fb40433a4eb4e116709fd2d0106698adc7129\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0dfb582d5a4da7dddf079c5a0f18bca77411c0de", "tree": "46145e8a15d78395ddd0157f4dd184659507ec53", "parents": [ "57e03f3b30dfa4f1e5aa8cadcde8bc2494a30256", "05cd2b61044ab66f8c2f23b9e91c09f901039148" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Tue May 31 15:48:01 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 31 15:48:01 2022 +0000" }, "message": "Merge \"Exclude launcher from app transition animation while recents is running.\" into tm-dev" }, { "commit": "0135f0a800eae21d79df3ec190e69184cc4cec1e", "tree": "ddcee5ec3bcdef12dc11a560a2da499bb7335998", "parents": [ "645973a3d8fc0b6c07b6f60209221a736e7263ae", "89b687bcf3e0d363f4ec82cdfbd40598b8aaadd4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu May 26 20:57:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 26 20:57:08 2022 +0000" }, "message": "Merge \"Update security_log_writer group name\" into tm-dev am: 8135158f39 am: 89b687bcf3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18616465\n\nChange-Id: Ic8d588ae932ed790d6fe198c6ca60bab2259647d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4130b736c83823971e5952777329b9e05ce76de7", "tree": "2d18e75e29676f56d06725ec0dc32db9fd5224d5", "parents": [ "5ee0e5c31bc4b2e22cd56bdab243ce57ba4a7a85", "597056d1b030a31f962a620506ce4459c59c1ab6" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Thu May 26 17:47:52 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 26 17:47:52 2022 +0000" }, "message": "Merge \"Map WRITE_SECURITY_LOG permission to gid\" into tm-dev am: f76cae7532 am: 597056d1b0\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18603750\n\nChange-Id: I6cabdbf5d790f907380424380439af943677ce1c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "07df5c4d161f68f92a397a1999ce09737a344006", "tree": "e390c47bd89f8d53669d66038009f7df3888ea8c", "parents": [ "f76cae7532289c300da8a9cbc1e539ee04e63102" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Thu May 26 12:44:55 2022 +0100" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu May 26 17:45:49 2022 +0000" }, "message": "Update security_log_writer group name\n\ngroup name was changed during review but not updated\nin the permission mapping.\n\nBug: 232283779\nTest: manual\nChange-Id: Ib7df61fa4fd49c8419f0543fd6c54186a33ebeb6\n(cherry picked from commit 4486314be61922813b346732a9b563c7b7c274b7)\nMerged-In: Ib7df61fa4fd49c8419f0543fd6c54186a33ebeb6\n" }, { "commit": "e20354c3c32344da7829b2a2e09a938b6e809891", "tree": "81e9d0b09e78b984adf88fa9634c38c443ab89c9", "parents": [ "57ad188703f5ac1e21f096ca892042a04a37fb1b", "b3fbe80e36f9c94ef8e1b3b68008f385f88f1c6b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu May 26 17:12:07 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 26 17:12:07 2022 +0000" }, "message": "Merge \"Update security_log_writer group name\" am: 5a66f41fa4 am: 5327a51e5a am: 63283e7450 am: b3fbe80e36\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084\n\nChange-Id: I3f189e0839934cc27cc26768064cf7436272e4dc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "63283e7450d7b8f2c18efaa1f4d698211d1762bd", "tree": "43532c1dd26796be1933460c445ed0b32ab2672d", "parents": [ "d90d0de1f4030c0a699e1daac361d7f7c45d4bb7", "5327a51e5aea9b70fd70895c2fe9962f2d6857eb" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu May 26 16:07:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 26 16:07:57 2022 +0000" }, "message": "Merge \"Update security_log_writer group name\" am: 5a66f41fa4 am: 5327a51e5a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084\n\nChange-Id: I06beb1a61be0620176466061cf86b3a7b37e8a51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5327a51e5aea9b70fd70895c2fe9962f2d6857eb", "tree": "0f0e507d7d7c8c5d3b2f6475c9c96fa96bf20c2a", "parents": [ "9c55d71a2520dc94c47f0aaa9cc96d0048cfa0f2", "5a66f41fa43293f572e63f80d3a9ef685272ebe6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu May 26 15:40:22 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 26 15:40:22 2022 +0000" }, "message": "Merge \"Update security_log_writer group name\" am: 5a66f41fa4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084\n\nChange-Id: I42fc0a1fb5536332a072430262b68636b3ad77b0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4486314be61922813b346732a9b563c7b7c274b7", "tree": "56091378e421ae82b5e4f89cdee84b7bb808d0a8", "parents": [ "aae5f3eecf5de58c7c6cb1c1baf031728ae5ea2b" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Thu May 26 12:44:55 2022 +0100" }, "committer": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Thu May 26 12:44:55 2022 +0100" }, "message": "Update security_log_writer group name\n\ngroup name was changed during review but not updated\nin the permission mapping.\n\nBug: 232283779\nTest: manual\nChange-Id: Ib7df61fa4fd49c8419f0543fd6c54186a33ebeb6\n" }, { "commit": "bcb0741c91ae9af3b65b8fc7a07e3f4dec54e7f5", "tree": "495aad02248176111e1fc1df9abf6d666bd001d1", "parents": [ "c56fb0fdebdb77b0ad32d53f41def89c9c45a811" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Tue May 24 23:23:10 2022 +0100" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed May 25 20:54:27 2022 +0000" }, "message": "Map WRITE_SECURITY_LOG permission to gid\n\nMap WRITE_SECURITY_LOG to AID_SECURITY_LOG_WRITE which is how logd\ncontrols access to security log buffer.\n\nBug: 232283779\nTest: manual\nChange-Id: Ifde2e5192326f0811807dcb05563b1b5b63077ce\n(cherry picked from commit e806776e54bf9c9972022e326626d95e9ba71129)\nMerged-In: Ifde2e5192326f0811807dcb05563b1b5b63077ce\n" }, { "commit": "4c5e6501a885ddacdd59cb759d1016be563f42d1", "tree": "f6ea3fd75a6984941081956a06e896d601211a9f", "parents": [ "efc37bbbe08045976b768e8e444607fbe57bbc14", "2e03027e1895a637252a945fd6c93be1b1c85c0d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 25 15:49:55 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 15:49:55 2022 +0000" }, "message": "Merge \"Merge \"Map WRITE_SECURITY_LOG permission to gid\" am: 2b2b455884 am: 356f81b957\" into tm-dev-plus-aosp am: df2b24a558 am: 2e03027e18\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065\n\nChange-Id: Idc073ce006d8004aad960390806c5c57252a6780\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05cd2b61044ab66f8c2f23b9e91c09f901039148", "tree": "01845c92497c7466c160cb12e8ab59d188b6f64a", "parents": [ "e2049a89685ef6fa80429fcfc80b678b5265b24f" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Fri May 20 16:28:36 2022 +0000" }, "committer": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Wed May 25 13:44:47 2022 +0000" }, "message": "Exclude launcher from app transition animation while recents is running.\n\nChanged approach to handle conflict between app transition and recents.\n\nIn order to fix flicker which happens when recents and app transition\nstart in a short time, we delayed app transition while recents was\nrunning. However this approach brought side effects such as b/232984498.\n\nWhen recents starts, we just want to wait that the launcher activitiy\nfinishes rendering and commit its visibility without animation. Added a\nflag DisplayContent#mExcludeLauncherFromAnimation flag, so that we can\nnow explicity declare whether we want to apply animation on the launcher\nor not.\n\nBug: 223499269\nBug: 231711212\nBug: 232984498\nTest: atest com.android.server.wm.AppTransitionTests\nTest: atest AppTransitionTest + manual tests\n Test 1\n 1. Launch Gmail app\n 2. Click icon on the bottom tab (e.g. Chat)\n 3. Swipe up from the bottom (immediately after step 2)\n 4. Verify closing animation only plays once\n Test 2\n 1. Launch \"Google TV\"\n 2. Play a trailer\n 3. Full screen and PIP mode switch twice\n 4. Verify PIP window is shown\n Test 3\n 1. Change phone to portlait mode\n 2. Launch Photo app\n 3. Swipe up from the bottom\n 4. Verify no rotation animation on the launcher\n Test 4\n 1. Install 3P launcher and set it default.\n 2. Launch Gmail app\n 3. Swipe up to go back home\n 4. Launch Chrome app\n 5. Swipe up and hold to go to overview.\n 6. Scroll to Gmail app and click.\n 7. Verify Gmail app is launched without delay.\nChange-Id: I0ccb99479684d17453ce57e8797024c0cd233ac3\n" }, { "commit": "c8c601c335258ce3dff96f3be02179e042e5bc7d", "tree": "a79cb58d1c4d9a7e59030f6efe3ea261d9c4d8c6", "parents": [ "76ca007028837b8e28982c739dd9a028b92794bd", "356f81b957fdd22400fe72dbfe727ab12e8c7744" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Wed May 25 12:20:46 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 12:20:46 2022 +0000" }, "message": "Merge \"Map WRITE_SECURITY_LOG permission to gid\" am: 2b2b455884 am: 356f81b957\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065\n\nChange-Id: Ic70701d437bc15b73b8ff85004c0329059499d64\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "356f81b957fdd22400fe72dbfe727ab12e8c7744", "tree": "f1ee9386258e597a2259c5dbd89bc4e540ee5e03", "parents": [ "09953ea51268a88aa836a9404bb274c79f154e96", "2b2b455884e8a505550ee28e4721efdf5c8147b2" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Wed May 25 12:01:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 12:01:56 2022 +0000" }, "message": "Merge \"Map WRITE_SECURITY_LOG permission to gid\" am: 2b2b455884\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065\n\nChange-Id: I8453536d82e840da22d7f94a167f4a95b3826ad5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2b2b455884e8a505550ee28e4721efdf5c8147b2", "tree": "cc67cf2b859903fa4ba7eb5bd40834138827e08a", "parents": [ "fbc5263e1a4fc2c78b55e1569025e66462e12b15", "e806776e54bf9c9972022e326626d95e9ba71129" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Wed May 25 11:43:50 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed May 25 11:43:50 2022 +0000" }, "message": "Merge \"Map WRITE_SECURITY_LOG permission to gid\"" }, { "commit": "e806776e54bf9c9972022e326626d95e9ba71129", "tree": "db89c66e2d0a47c5c2cf7487bb4a6a0580a35e0c", "parents": [ "33d67f0b14eec5333af5befe02ad81ac8150d386" ], "author": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Tue May 24 23:23:10 2022 +0100" }, "committer": { "name": "Rubin Xu", "email": "rubinxu@google.com", "time": "Tue May 24 23:27:10 2022 +0100" }, "message": "Map WRITE_SECURITY_LOG permission to gid\n\nMap WRITE_SECURITY_LOG to AID_SECURITY_LOG_WRITE which is how logd\ncontrols access to security log buffer.\n\nBug: 232283779\nTest: manual\nChange-Id: Ifde2e5192326f0811807dcb05563b1b5b63077ce\n" }, { "commit": "ce8f9488f26c0f24c339eeeaef882af86d7f059c", "tree": "7421d4b169807002ad5f4272e01e61a5e7a59d80", "parents": [ "96aabf1116b1daf99a6b6efa78f980baf06aab22", "d0cd381a0bec2d430803f0971dca562a9828a4a9" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed May 18 22:47:35 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 18 22:47:35 2022 +0000" }, "message": "Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f948e am: d0cd381a0b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18385451\n\nChange-Id: I80e97f57ea58634ecc647bccded63ef15615c558\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7b52f23021af91dbe28fe6c6949bf0a103942959", "tree": "f4038c4baf2561bb78718fd8912feef3f4025f01", "parents": [ "c31d8ad7246bd39089210c3edf5a94f533c3d607", "b5d25971f9f85c2ef7ee5b4aea32137a5b04a9a3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 18 21:51:40 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 18 21:51:40 2022 +0000" }, "message": "Merge \"Remove duplicate allowlist entries for Bluetooth\" into tm-dev am: 5ea9ade689 am: b5d25971f9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601\n\nChange-Id: I91ce49042ff421fb80035a1b34795319fb61168c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "35640f948e248324401defb4e39a62928509bc28", "tree": "224aace7fb7cd4d4fb18c5c60acb4d856236ec8e", "parents": [ "c3b917ad972f7a0417022e5201fe3a9ab9c332dd", "03df66775f830c42899b8b599d03fafe6a8bbceb" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed May 18 17:23:38 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 18 17:23:38 2022 +0000" }, "message": "Merge changes I1978ce3a,I79160004 into tm-dev\n\n* changes:\n Add workaround for new back flow with legacy recents animation\n Ensure recents input consumer can be focused in Overview\n" }, { "commit": "97b292f62708afd88f63209b41850f762f3a2b40", "tree": "f660de645670c525d68dd7d4d53b2656536e75ce", "parents": [ "43ad687b92b642157bf8a6a47e2bb4bbe8853837", "046ec8336e8c7a997f8a85e564ed3dd363d44045" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Tue May 17 17:06:00 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 17 17:06:00 2022 +0000" }, "message": "Merge \"Fix pip bundling\" into tm-qpr-dev" }, { "commit": "5ea9ade6896139e13dac80bbae7f8b44b4979d63", "tree": "6190ecbd28051fad38360e2b0edf2ad972816ab0", "parents": [ "05e61e90c5614d7b84de7c9605dad2a16c3115d6", "7a8010b205e4913e34106e9ada1770c25450a4e8" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 16 20:59:24 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 16 20:59:24 2022 +0000" }, "message": "Merge \"Remove duplicate allowlist entries for Bluetooth\" into tm-dev" }, { "commit": "046ec8336e8c7a997f8a85e564ed3dd363d44045", "tree": "4f52934fbaaec6e28a58691f48d682b89bf5305e", "parents": [ "e269e8e7ca8676ffce2301d62e1f9306cdcfd5f6" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Thu May 12 22:35:56 2022 -0700" }, "committer": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Mon May 16 11:56:15 2022 -0700" }, "message": "Fix pip bundling\n\nNot all pips should be their own transition. This CL\nchanges the rules so that any pip originally requested\nby the system (even if done via the app -- eg legacy\npause+userLeaving) will not get their own transition\nand instead be bundled into the current one.\n\nThis also fixes an issue where transient launch\ncommittal was only entering pip for the new auto-enter\ncase but not the legacy userLeaving case.\n\nBug: 220196913\nBug: 231150615\nTest: launch a legacy userLeave-enters-pip app and\n then go home (swipe or button).\nChange-Id: I3c20341971ab4512509daa70314742f84c1ccd6b\n" }, { "commit": "03df66775f830c42899b8b599d03fafe6a8bbceb", "tree": "81326557b200b3f516bbed1ea430e78e4773ec71", "parents": [ "34a280bc45a7afcf6c8bfd9d416ada4c8309f813" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Sat May 14 00:08:43 2022 +0000" }, "committer": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Sat May 14 00:09:13 2022 +0000" }, "message": "Add workaround for new back flow with legacy recents animation\n\n- Override the callback to inject back as we do today while in Overview.\n We can\u0027t rely on the client side compat callback because the Launcher\n window is not focused in this current state.\n\nBug: 223750399\nTest: Open overview, swipe back\nChange-Id: I1978ce3a91cba3e57c0f8bab366691b48a9d5921\n" }, { "commit": "7c001fabf2e1194382847a6a04dabd9bcd6c81d7", "tree": "3ff8b6a42a016d5b0c99b94e03583974f25b1f8e", "parents": [ "5baf5662ed5b21d147d478c4f6b3d3c57a242cdb", "d260e1cbcdd3834331978d00a349d5fb55432169" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Fri May 13 18:17:43 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 13 18:17:43 2022 +0000" }, "message": "Merge \"Ensure move-to-back has its own transition.\" into tm-qpr-dev" }, { "commit": "d260e1cbcdd3834331978d00a349d5fb55432169", "tree": "1a430b7895f4d0df1b917128be185230d144f9de", "parents": [ "03ffb3babed398dd67cface64f2a43fd742b469b" ], "author": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Mon May 09 15:15:53 2022 -0700" }, "committer": { "name": "Evan Rosky", "email": "erosky@google.com", "time": "Thu May 12 10:51:00 2022 -0700" }, "message": "Ensure move-to-back has its own transition.\n\nIn general, we need to move to a model where each transition is\na \"fixed\" transaction (rather than absorbing everything within\na specific time-window).\n\nBug: 232020248\nTest: PinnedStackTests#testMovePipToBack*\nChange-Id: Icf5d36e507bc70736e7760c50d5de297bfe4d8f4\n" }, { "commit": "343260adfa03fed62e51ac9ab424db49e6e1ac24", "tree": "1c5d008ddebf2c0948380807b179180d4a091c0f", "parents": [ "b8ea1e4b7b4a8c6f36381eb48ac6427566d35867", "0e1d4e23cb91ee650cdb161f2d6eca5d2df1aaad" ], "author": { "name": "Nick Chameyev", "email": "nickchameyev@google.com", "time": "Thu May 12 16:55:06 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 12 16:55:06 2022 +0000" }, "message": "Merge \"Synchronize display change with the Shell\" into tm-qpr-dev" }, { "commit": "735dc5d336a979adca37b775349c60d937a93767", "tree": "1e7834cad86f77113429f28a57d4f5bf336cdc3d", "parents": [ "f4246c5738e131431e8e41a53a0e103038b2d479", "bc33153bb5661f318606fdc750b949bb9afea744" ], "author": { "name": "Galia Peycheva", "email": "galinap@google.com", "time": "Wed May 11 20:48:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 11 20:48:56 2022 +0000" }, "message": "Merge \"Set TvBottomSheetActivity as unrestricted keep-clear area\" into tm-dev am: 7a662cfbf9 am: bc33153bb5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18177605\n\nChange-Id: I15294f4498203f660fb506ccabbb84cf09f933e3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7a662cfbf9e08ce490627f389b467f33176fb34d", "tree": "8e5ba7a3b863b95c19687c185b113be7b59aa8b8", "parents": [ "32667b28c6b908005297aa2f3b54672d91e4a2ec", "557fc354c138b5b22dca865531dc087086a1e52c" ], "author": { "name": "Galia Peycheva", "email": "galinap@google.com", "time": "Wed May 11 07:43:24 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 11 07:43:24 2022 +0000" }, "message": "Merge \"Set TvBottomSheetActivity as unrestricted keep-clear area\" into tm-dev" }, { "commit": "006fa97387a58f65eb188d658d7052a30c9764bb", "tree": "625b09795c967b5f0ca5667d2d89bf5a554e7481", "parents": [ "7a6a65f5a22853cde39b7b9210c84f930ba06549", "b1050a102feb98afb1aa424d4cc07eb533944135" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Tue May 10 21:41:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 10 21:41:32 2022 +0000" }, "message": "Merge \"Suppress app transition while recents is running\" into tm-dev am: fca1e25c59 am: b1050a102f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232543\n\nChange-Id: Ida53de8a528cd005ff997280c47ef1afac74fdce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e1d4e23cb91ee650cdb161f2d6eca5d2df1aaad", "tree": "d30f0429ea25513210b6268a22605a4ce4bee308", "parents": [ "c3565a503dc37bdc51d479bd07ae3fd77b8a87d3" ], "author": { "name": "Nick Chameyev", "email": "nickchameyev@google.com", "time": "Tue May 03 11:17:15 2022 +0000" }, "committer": { "name": "Nick Chameyev", "email": "nickchameyev@google.com", "time": "Tue May 10 09:50:34 2022 +0000" }, "message": "Synchronize display change with the Shell\n\nThis CL adds synchronization of applying of the window\ncontainer transaction with split-screen layout changes after\nthe display size change. This is needed for the unfold\nanimation to have the split screen layout ready\nfor the first frame of the unfold animation on foldable\ndevices.\n\nThe flow is similar to the display rotation synchonization,\nnow it is triggered on both physical display change and\nrotation.\n\nBug: 204925795\nTest: folding/unfolding, rotating with a split layout\n when Shell transitions enabled/disabled\nChange-Id: I30f391dae69cf38768daf49361660d87165f886d\n" }, { "commit": "ada19dd903a82ea2eefd060b72063e00a5c1f914", "tree": "4cfe1c61a015687b2d87b33799627cdde961acc0", "parents": [ "5d05d5a49b554d94f3b2b8983626f2da71df5e98", "005860c14cc2f6051539cd66376b6bb4280d1833" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Mon May 09 15:21:06 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 09 15:21:06 2022 +0000" }, "message": "Merge \"Revert \"Suppress app transition while recents is running\"\" into tm-dev am: d2303d97a4 am: 005860c14c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18204686\n\nChange-Id: I9f6c2f5259b242a158d87f2f5047a12b234e8870\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d49b5d442dd8e473f4f980a41ea83dcbeec27345", "tree": "86c74850afcca4ad0d571621b75ba869236813bd", "parents": [ "9c9916e4d9a4f9e8c68c23f251a48e5b6da1f3ce" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Wed Apr 27 15:37:03 2022 +0000" }, "committer": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Mon May 09 14:10:14 2022 +0000" }, "message": "Suppress app transition while recents is running\n\nThis fixes conflict between app transition and recents animation in the\nfollowing scenario.\n\n1) App transition animation finishes after app closing animation, which\nis controlled by recents, finishes.\n\nDuring the app closing animation, recents makes the closing app surface\ninvisible, but app transition animation overrides it to visible again.\nThis causes a flicker.\n\n2) App transition starts during recents animation.\n\nThis can happen when a user launches an activity, and immediately after\nthat, swipes up the screen to close the app.\n\nWhile recents is running, we assume animation on tasks is controlled by\nrecents, and visibility is commited without animation after recents\nanimation finishes. However starting app transition during recents\nbreaks this assumption, which ends up with playing one more unexpected\nclosing animation (so users see closing animation twice).\n\nBug: 223499269\nBug: 231669960\nTest: atest AppTransitionTest + manual tests\n Test 1\n 1. Launch Gmail app\n 2. Click icon on the bottom tab (e.g. Chat)\n 3. Swipe up from the bottom (immediately after step 2)\n 4. Verify closing animation only plays once\n Test 2\n 1. Launch \"Google TV\"\n 2. Play a trailer\n 3. Full screen and PIP mode switch twice\n 4. Verify PIP window is shown\n Test 3\n 1. Change phone to portlait mode\n 2. Launch Photo app\n 3. Swipe up from the bottom\n 4. Verify no rotation animation on the launcher\nChange-Id: Ic18d00812308903db08d3564136f33f1eccf408c\n" }, { "commit": "d2303d97a41c15e8a52f5d8d547da4014d17466a", "tree": "7c96aed39ec7f264852bbc7b31074f8dadb45664", "parents": [ "003535ddbe13e96eaf7be5b3490a2c99cdb5ba8c", "a2e0455cd971bf0316265d87907fbb5e78c5bde7" ], "author": { "name": "Issei Suzuki", "email": "issei@google.com", "time": "Mon May 09 10:00:41 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 09 10:00:41 2022 +0000" }, "message": "Merge \"Revert \"Suppress app transition while recents is running\"\" into tm-dev" } ], "next": "a2e0455cd971bf0316265d87907fbb5e78c5bde7" }