Commit Graph

78507 Commits

Author SHA1 Message Date
Tracy Zhou 323958007d Add initial trackpad tapl tests
- go home

Bug: 281732733
Test: presubmit
Change-Id: I538d63bde2bf427a02c2bc355eab71546d667bf9
2023-07-03 10:50:54 -07:00
Android Build Coastguard Worker 9fb82f6215 Snap for 10423847 from 491b0f9028 to udc-qpr1-release
Change-Id: I25ca668880f74090c616c44cc8d970f123e5eddf
2023-07-01 23:18:49 +00:00
Android Build Coastguard Worker 325e8a6323 Snap for 10421851 from 957d46ae52 to udc-qpr1-release
Change-Id: I3384302ef703ee13cf14262bc509c65f2307dfc2
2023-07-01 01:24:08 +00:00
Jagrut Desai 96a8d9f9c3 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: d4b4e95bea am: 491b0f9028 am: 491eb03668
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I3c4527df86763aca1354945d6f7adedd76cad56c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 01:17:57 +00:00
Jagrut Desai fb1755102e Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: 982dacc7ef am: 4fc44d56a9 am: ca6ef7e29a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: Ib1c333bf8391d93e4638417b0c6bd25ec709ff15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 01:17:14 +00:00
Jagrut Desai 8173e89af0 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: d4b4e95bea am: 62dd220b69 am: 9f3a115ab0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I426c472efbbc08b0089604ba06abeee02d7e89d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 01:16:05 +00:00
Jagrut Desai 491eb03668 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: d4b4e95bea am: 491b0f9028
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I1f51078eb6167d5dde01df2918abd8abdd3a8a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:34:51 +00:00
Jagrut Desai ca6ef7e29a Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: 982dacc7ef am: 4fc44d56a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I18c2abbb984f1ef9c8c649d554116d522e2340a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:30:44 +00:00
Jagrut Desai 9f3a115ab0 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: d4b4e95bea am: 62dd220b69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I616ad6bb87381eca5b452ddadd460d35f4b71414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:29:18 +00:00
Jagrut Desai bd15977020 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: efba64d65f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: Ida48ee884afccf26a6e5ef44c4af1f2f93cbbf8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:48:45 +00:00
Jagrut Desai 4fc44d56a9 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: 982dacc7ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I686be2553533fbec2b6c45af460fa482580bb500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:47:47 +00:00
Jagrut Desai 491b0f9028 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: d4b4e95bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I9d438b3edda25a7407d30d702013b385b3fd9195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:47:37 +00:00
Jagrut Desai 62dd220b69 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: d4b4e95bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I2c06c2637c4d7fefab71ea87af677b210cd2829c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:45:46 +00:00
Jagrut Desai 2b01cb4bd4 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f am: e88a949a17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I0db039662d4a1d25104d7373e8c22affbdbea74c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:45:15 +00:00
Android Build Coastguard Worker 479b6e75c0 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23852178', 'googleplex-android-review.googlesource.com/23845422'] into udc-release.
Change-Id: Id2f13f18793e0a6b6c00368be8cf2de6cf329092
2023-06-30 23:27:52 +00:00
Jagrut Desai 7cc6f65011 Taskbar All Apps Shortcut Menu Acccessibility Focus
Bug: 280657266
Test: manual
Flag: not needed
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:53d953ccd24cd378418d9bd8c9964589fb1af44a)
Merged-In: I2426636067ce3635b8b24b9f5d093dad7d9ddf4c
Change-Id: I2426636067ce3635b8b24b9f5d093dad7d9ddf4c
2023-06-30 23:26:29 +00:00
Jon Miranda df537ccdb7 Cleans up bad state when transient taskbar shows on home.
Bug: 279514548
Test: open transparent activity on top of launcher
      unstash taskbar
      go home
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3bad3ebaad529a8be587b9c0eae61faf87ea8505)
Merged-In: I13ab79b334e1f8feda441a82cc4d035c0142f513
Change-Id: I13ab79b334e1f8feda441a82cc4d035c0142f513
2023-06-30 23:26:22 +00:00
Jagrut Desai 982dacc7ef Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I5c4b401023efb9cd5fcdbff50819dc95ad6cc4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:06:12 +00:00
Jagrut Desai efba64d65f Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I782a431defdc72b8a73d8a862dd6443e06d3330c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:05:36 +00:00
Jagrut Desai e88a949a17 Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: Iee33ca78be02118b1e6471d9d558c82d05a786aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:05:16 +00:00
Jagrut Desai d4b4e95bea Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422

Change-Id: I33a1ec0e54a662878f981bd599abb3f1d5c6f105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 23:05:06 +00:00
Jagrut Desai fa2a81844f Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev 2023-06-30 22:29:20 +00:00
Holly Sun 1a9a98005d [a11y] Fix crash when using talkback to add to home screen.
1. Fix a crash from http://cs/android-internal/packages/apps/Launcher3/src/com/android/launcher3/Launcher.java;l=1928;rcl=d677caa75de74f1c3a88367cad67ae405fd2903d. It can also be `ITEM_TYPE_SEARCH_ACTION`. Remove the `itemType` check and just use the `PendingAddItemInfo` class type.
2. Override `startConfigActivity` in `PinShortcutRequestActivityInfo`, so that `Launcher#onActivityResult` can be triggered properly from `Launcher#processShortcutFromDrop` (http://cs/android-internal/packages/apps/Launcher3/src/com/android/launcher3/Launcher.java;l=1939;rcl=d677caa75de74f1c3a88367cad67ae405fd2903d )
3. Then we call to `Launcher#completeAdd` -> `completeAddShortcut`. The original `info` passed to `processShortcutFromDrop` doesn’t have a `componentName` (new code), so remove the component non-null check from `completeAddShortcut`.

Bug: 287166186
Bug: 287167527
Bug: 287166771
Test: manual
Flag: N/A
Change-Id: Id3e1444de188f2d2af760f58e3d9814a2b7abd88
Merged-In: Id3e1444de188f2d2af760f58e3d9814a2b7abd88
(cherry picked from commit 35b9960b63)
2023-06-30 20:49:33 +00:00
Treehugger Robot dcde9874ed Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2 am: 957d46ae52 am: 5e23c3025d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I60c2124c049641a94f62b4e37d581336dafff9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 20:17:34 +00:00
Treehugger Robot bc1c56aa17 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4264a7d135 am: c44ae73e4f am: e2529cecff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I5fbbcc0b719bb4264684c005017e7861764310cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 20:16:56 +00:00
Treehugger Robot 85b657c704 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2 am: 120c78d24f am: dd262b4617
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I197545b22bb294048915c5bcee8ce6bcceaf6d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 20:15:38 +00:00
Treehugger Robot 5e23c3025d Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2 am: 957d46ae52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I61abe7d28129799ee0e39c289c5fa29b92d95e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:53:19 +00:00
Treehugger Robot e2529cecff Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4264a7d135 am: c44ae73e4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: Ia6526b05a6ab2f57cc44ffa3979c7a8c2a2697fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:30:34 +00:00
Treehugger Robot dd262b4617 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2 am: 120c78d24f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I852fc4d1f95af8ef5be6fa02dd1d1d404b8cd92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:28:58 +00:00
Treehugger Robot 912aeefce6 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4fa79df948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I785885330c13e95455f11778eb8edeae28abff6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:06:41 +00:00
Holly Jiuyu Sun bdd0859b8a Merge "[a11y] Fix crash when using talkback to add to home screen." into udc-qpr-dev am: 18e0e1e50a am: d91ee8f9af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23849395

Change-Id: I2c5cc943205c9fb6528090ee64d539e0f0dca3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:06:02 +00:00
Treehugger Robot c44ae73e4f Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4264a7d135
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I8cbe4f47fc876d1a90fdf97b0b110ee9b10b7c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:05:50 +00:00
Treehugger Robot 957d46ae52 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: Idbb6ded338cf1fe3db8142ba75d54844a9bf1382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:05:32 +00:00
Treehugger Robot 120c78d24f Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I1302f2aeaeb17fa95a1a64cb2e095febadcacba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:03:05 +00:00
Treehugger Robot 20fa45a004 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 67b5bc8c4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: Iab9ff4080c4f4d36918538c686dec5ea4af35fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:03:05 +00:00
Holly Jiuyu Sun d91ee8f9af Merge "[a11y] Fix crash when using talkback to add to home screen." into udc-qpr-dev am: 18e0e1e50a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23849395

Change-Id: I677a0e430b79b13a85f955a85421d78c5a166969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 18:27:19 +00:00
Treehugger Robot 4264a7d135 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I9db459debe4075642f868ca1f46c05ee14d7bd2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 18:22:57 +00:00
Treehugger Robot 67b5bc8c4c Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I68510c624c597e572dd4e06b0e36c6d994c60ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 18:22:29 +00:00
Treehugger Robot 4de15620c2 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I31bb8d94d473716e148140372e61fc71fc024deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 18:22:28 +00:00
Treehugger Robot 4fa79df948 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178

Change-Id: I449818f5a734b4b1b290563e0dced1e05a1f3c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 18:22:24 +00:00
Schneider Victor-tulias 2bb622e6af Merge "Update TestProtocol.REQUEST_CLEAR_DATA to properly clear the workspace" into udc-qpr-dev am: 720d0cf4c4 am: 045f9cf583
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23835672

Change-Id: Iadfd6c805fdcf1fd43ef1e9225c32b93d5901d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 18:03:44 +00:00
Holly Jiuyu Sun 18e0e1e50a Merge "[a11y] Fix crash when using talkback to add to home screen." into udc-qpr-dev 2023-06-30 17:56:16 +00:00
Treehugger Robot 2c3c1e46c0 Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev 2023-06-30 17:45:50 +00:00
Schneider Victor-tulias 045f9cf583 Merge "Update TestProtocol.REQUEST_CLEAR_DATA to properly clear the workspace" into udc-qpr-dev am: 720d0cf4c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23835672

Change-Id: I392b76e7b4263d1ca33fc33dac3ecf20660795d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 17:23:21 +00:00
Schneider Victor-tulias 720d0cf4c4 Merge "Update TestProtocol.REQUEST_CLEAR_DATA to properly clear the workspace" into udc-qpr-dev 2023-06-30 16:54:30 +00:00
Holly Sun 35b9960b63 [a11y] Fix crash when using talkback to add to home screen.
1. Fix a crash from http://cs/android-internal/packages/apps/Launcher3/src/com/android/launcher3/Launcher.java;l=1928;rcl=d677caa75de74f1c3a88367cad67ae405fd2903d. It can also be `ITEM_TYPE_SEARCH_ACTION`. Remove the `itemType` check and just use the `PendingAddItemInfo` class type.
2. Override `startConfigActivity` in `PinShortcutRequestActivityInfo`, so that `Launcher#onActivityResult` can be triggered properly from `Launcher#processShortcutFromDrop` (http://cs/android-internal/packages/apps/Launcher3/src/com/android/launcher3/Launcher.java;l=1939;rcl=d677caa75de74f1c3a88367cad67ae405fd2903d )
3. Then we call to `Launcher#completeAdd` -> `completeAddShortcut`. The original `info` passed to `processShortcutFromDrop` doesn’t have a `componentName` (new code), so remove the component non-null check from `completeAddShortcut`.

Bug: 287166186
Bug: 287167527
Bug: 287166771
Test: manual
Flag: N/A
Change-Id: Id3e1444de188f2d2af760f58e3d9814a2b7abd88
2023-06-30 08:42:31 -07:00
Federico Baron 3ece704d8d Merge "Add WidgetPicker screenshot tests" into udc-qpr-dev am: 25f5fc2470 am: 445d7d266e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23437865

Change-Id: Ib271c39fd364d91d6757dbef8ed5646dc0ac1b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 03:36:25 +00:00
Treehugger Robot 6dbeb89981 Merge "Fix ReorderAlgorithmUnitTest not restoring numRows properly" into udc-qpr-dev am: c243875235 am: 8d4543f8fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23843686

Change-Id: I3e91ca69caf3a102bb915bb6d333f96076e7d07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 03:36:13 +00:00
Treehugger Robot c3e58f7e1c Merge "Small tweak to floating search on phone." into udc-qpr-dev am: 4c4f9b67a7 am: 23b5527ade
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23670474

Change-Id: Iad9ca7d4a34d0bf63a6a20797d5981b7e691a598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 03:35:44 +00:00
Android Build Coastguard Worker 4fa7d26749 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23833485', 'googleplex-android-review.googlesource.com/23823197'] into udc-release.
Change-Id: I20b6989131358a596810ae6834845dea6885ede3
2023-06-30 03:20:11 +00:00