Commit Graph

896749 Commits

Author SHA1 Message Date
Beth Thibodeau
fffc2002c6 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours am: 25fc1e7d44 -s ours am: 33a18d8b82 -s ours am: 570b5f5b05 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: I4e82560e7d7deb4868e70aa59e59db7ce5dbb183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 19:30:11 +00:00
Beth Thibodeau
570b5f5b05 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours am: 25fc1e7d44 -s ours am: 33a18d8b82 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: Ifb02319e4c325cb2aba530fb27e3316f016049c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 19:08:03 +00:00
Josep del Río
8d51b1d6c2 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: 5fa491d564 -s ours am: b2fcb236e4 -s ours am: f51e507c53 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: I9b5be0cededfa4a9316eff54cdb06a923bcbf2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:48:29 +00:00
Caitlin Shkuratov
534a31ac36 Merge "[Status Bar] Use defaultDataSubId flow to trigger config re-fetch." into udc-dev am: 30864e5b91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23905086

Change-Id: I20a862b3f8c0bfb7fdeac423409b33bc16b473c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:48:08 +00:00
Josep del Río
c3dc03efa9 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: eb9894cbb6 -s ours am: c67fffa8e5 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: I1859c3f9997089bc371e8136ab753a85e5ccc290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:47:25 +00:00
Josep del Río
f51e507c53 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: 5fa491d564 -s ours am: b2fcb236e4 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: I42e9fe15ab95637d7c891c2fb05c8e8c63a75635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:47:22 +00:00
Caitlin Shkuratov
30864e5b91 Merge "[Status Bar] Use defaultDataSubId flow to trigger config re-fetch." into udc-dev 2023-07-10 18:29:47 +00:00
Beth Thibodeau
33a18d8b82 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours am: 25fc1e7d44 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: I90ed25b783049b0a248fab5dbab6fcbe27a5020e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:29:10 +00:00
Josep del Río
b2fcb236e4 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: 5fa491d564 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: I51295992f9b214e82c970910f8a9f8d7697b6cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:09:03 +00:00
Josep del Río
c67fffa8e5 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: eb9894cbb6 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: I0a47a8b919007d8301fcfb08e509f528903c7907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:05:14 +00:00
Beth Thibodeau
25fc1e7d44 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: I60bb75ae934b489d1776b9bd377c938b8e283506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:42:18 +00:00
Josep del Río
5fa491d564 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: Ia3a2a0a0278653d7c9cf81b8708bba8add263a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:26:12 +00:00
Josep del Río
eb9894cbb6 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: I412da3470999fdf4a2bccd954d4ce50046c44810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:25:41 +00:00
Mady Mellor
6e8b54530e Merge "Fix how taskview is used by controlsUi" into udc-dev am: 646c4f254e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23753646

Change-Id: Ib6809b48deb9121415a27ad2b7f623cdbe0a9990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:22:51 +00:00
Beth Thibodeau
779c9e902d [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: I65fdc91f7ce01ec9a35ddab15ff6154edf85ebc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:05:34 +00:00
Mady Mellor
646c4f254e Merge "Fix how taskview is used by controlsUi" into udc-dev 2023-07-10 16:41:31 +00:00
Josep del Río
c93d0f50d7 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: Ie2a9b1474e9a875bbdcd6310a29da0f6ddeff8b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:39:38 +00:00
Beth Thibodeau
e3b5c470b9 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: I4dfa2e48c373cc08e5ec334fbd56a78e1181d0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:20:17 +00:00
Josep del Río
baf0b865c5 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: If25c271657fd7376080417589fb54a0507c8f872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:03:01 +00:00
Beth Thibodeau
b0a33db6d6 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: Ic0b71395b83f8cf0b84a0221686b28da1eeab161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 15:38:12 +00:00
Josep del Río
bda1982e35 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: Id38fa48faaed0ca3a5d60694ab2024cbff09ac68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 15:17:43 +00:00
Beth Thibodeau
3134c90f79 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099

Change-Id: I164860da1413eca9d5b9c1a1e4f3991fd6248e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 14:54:32 +00:00
Josep del Río
458c17a5ae [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: Icfbad10c769ba3074855e6268cf5bbf6b5974098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 14:35:30 +00:00
Josep del Río
83d362e91d Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288

Change-Id: I6eaf07979ae4f1002b0938b6706a34c71d92abdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 13:51:59 +00:00
Josep del Río
6676e5a88b Merge "Do not share key mappings with JNI object" into rvc-dev 2023-07-10 13:10:54 +00:00
Treehugger Robot
649ef50446 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303ff -s ours am: 8bcc296564 -s ours am: 4c58d503e6 -s ours am: 92019fc099 -s ours am: 3a5c79c3f6 -s ours am: ddb8d9e6f9 -s ours am: 8ff98e96b1 -s ours am: cbba85d233 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861195

Change-Id: I9c047a4613670cd1ba0a32585bfc2d8ed9e608bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 12:12:10 +00:00
Beth Thibodeau
103548b0af [automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a0e -s ours am: 28203b9640 -s ours am: 6f8b219eb1 -s ours am: 8233aa715e -s ours am: cffddc61a7 -s ours am: 47b9802daf -s ours am: c5a45d4bb8 -s ours am: 3da27b22c2 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861195

Change-Id: I8262c2bac70a9b719d9a5a66555aad6b393e0c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 12:12:06 +00:00
Treehugger Robot
58e1cef6d0 [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c04 -s ours am: 1a214343af -s ours am: 6ac657ef80 -s ours am: a13e8f7c1f -s ours am: 4ad8de3aeb -s ours am: 72fba6278d -s ours am: a2915ecd6f -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 5eb6073925 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861644

Change-Id: Idd5fbdfdec4f0a0f90032d1931a371cd46097a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 12:11:51 +00:00
Beth Thibodeau
a161edc1c9 [automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f51 -s ours am: 3527030292 -s ours am: d8080f187c -s ours am: 050f2c7b2f -s ours am: 5f0c43aa5d -s ours am: f96b9295dc -s ours am: d484ea15ac -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 5eb6073925 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861644

Change-Id: Ic354836311087f15f9e07a08c6adf5d6d4bdfe6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 12:11:47 +00:00
Treehugger Robot
cbba85d233 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303ff -s ours am: 8bcc296564 -s ours am: 4c58d503e6 -s ours am: 92019fc099 -s ours am: 3a5c79c3f6 -s ours am: ddb8d9e6f9 -s ours am: 8ff98e96b1 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861195

Change-Id: I59b60d661b200d950dec50e3b961668e0337e535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:52:16 +00:00
Beth Thibodeau
3da27b22c2 [automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a0e -s ours am: 28203b9640 -s ours am: 6f8b219eb1 -s ours am: 8233aa715e -s ours am: cffddc61a7 -s ours am: 47b9802daf -s ours am: c5a45d4bb8 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861195

Change-Id: If29ff68db3e1206f5de0494f883870b4199e6ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:51:58 +00:00
Treehugger Robot
a2915ecd6f [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c04 -s ours am: 1a214343af -s ours am: 6ac657ef80 -s ours am: a13e8f7c1f -s ours am: 4ad8de3aeb -s ours am: 72fba6278d -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 5eb6073925 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861644

Change-Id: I0f7aa7079a3e1ace1af85982f4811f22b340542f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:51:34 +00:00
Treehugger Robot
2144e848f0 [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev am: 3554a4a7ed -s ours am: 5db6d9c6d4 -s ours am: a364fe8a3f -s ours am: 6fc543e3a2 -s ours am: 778753322c -s ours am: 12b4e2759e -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 b7e77454e8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23878542

Change-Id: I8b65f72b0ceb9673298d2dc6583ea44b3992ad2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:51:26 +00:00
Beth Thibodeau
10bf669ac4 [automerger skipped] Improve user handling when querying for resumable media am: 5eb6073925 -s ours am: cfa9b693b9 -s ours am: 75d61fabcf -s ours am: f6add77cdb -s ours am: 57255ca0f9 -s ours am: a8786be0c8 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 b7e77454e8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23878542

Change-Id: I8d3ef64ddf6913aee4bd82b2e0faed7ed97e330a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:51:23 +00:00
Beth Thibodeau
d484ea15ac [automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f51 -s ours am: 3527030292 -s ours am: d8080f187c -s ours am: 050f2c7b2f -s ours am: 5f0c43aa5d -s ours am: f96b9295dc -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 5eb6073925 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861644

Change-Id: I29fb2d45b9dee3aea7faa8079d3c95260e449e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:51:17 +00:00
Beth Thibodeau
b64f1e489e [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-v2-dev am: dd1fb1e5b7 -s ours am: 93b178dce7 -s ours am: ea9b9fc934 -s ours am: 53fbacd692 -s ours am: d006be29e8 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 d61741288b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23860830

Change-Id: I646a2581d1e4ef410dfee062a3e5315208114d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:50:57 +00:00
Beth Thibodeau
c173a707e2 [automerger skipped] Improve user handling when querying for resumable media am: b7e77454e8 -s ours am: f3a6731fea -s ours am: b8d8478370 -s ours am: 42bb52f7e6 -s ours am: ef6c6cc555 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 d61741288b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23860830

Change-Id: Ibeeb52ab9983657ff123c370150d98b3cdb99fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:50:53 +00:00
Treehugger Robot
12b4e2759e [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev am: 3554a4a7ed -s ours am: 5db6d9c6d4 -s ours am: a364fe8a3f -s ours am: 6fc543e3a2 -s ours am: 778753322c -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 b7e77454e8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23878542

Change-Id: I1cc3693975200e4d8b634b0810c4a9b0eb15b438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:50:44 +00:00
Dmitry Dementyev
0cc79b0d3d [automerger skipped] Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531 am: c0cf1e4a4f am: a2473bfbcf am: efd4924e2a -s ours am: 63714628bb -s ours am: 089d124b7b -s ours am: 08c82aeae2 -s ours am: 8f1cadb895 -s ours
am skip reason: Merged-In Ia2030a9dc371dccadd4e188a529351ac4232bb4f with SHA-1 8476b140ee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016

Change-Id: I76c9c8e4b7fea0221d727382f7f7f4405b8d25fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:50:38 +00:00
Josep del Río
0c3b784de3 Merge "Do not share key mappings with JNI object" into sc-dev am: 4a45e9c435 am: 77cbfcd9a8 am: c6952e05d1 am: b3bb4cfe8a am: d25574f3df am: 5be3efe8f2 am: 461693045f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23785419

Change-Id: I1622eacda490346391527ac82213d3c5ec447e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:50:27 +00:00
Beth Thibodeau
a8786be0c8 [automerger skipped] Improve user handling when querying for resumable media am: 5eb6073925 -s ours am: cfa9b693b9 -s ours am: 75d61fabcf -s ours am: f6add77cdb -s ours am: 57255ca0f9 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 b7e77454e8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23878542

Change-Id: I72645a9b322ab09132c02905ffb2e290610672d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:50:26 +00:00
Treehugger Robot
5bd48d31ff [automerger skipped] Merge "Visit Uris added by WearableExtender" into rvc-dev am: 345239848c am: d013fed990 -s ours am: 56cbe2e163 -s ours am: 6df1579710 -s ours am: 35e0d9d4a6 -s ours am: 39aa5318b6 -s ours am: 93b27254d8 -s ours am: abb2b89baf -s ours am: b96c8e2ebd -s ours
am skip reason: Merged-In I0da18c631eb5e4844a48760c7aaedab715a0bfed with SHA-1 3d36966ea2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23892861

Change-Id: I4cd6b5da4affde97db01ee9ab14983ba913f9c14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:50:08 +00:00
Beth Thibodeau
d006be29e8 [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-v2-dev am: dd1fb1e5b7 -s ours am: 93b178dce7 -s ours am: ea9b9fc934 -s ours am: 53fbacd692 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 d61741288b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23860830

Change-Id: Ieb7916a869d611c224ca7dd7e7ec98c89aac87e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:57 +00:00
Beth Thibodeau
ef6c6cc555 [automerger skipped] Improve user handling when querying for resumable media am: b7e77454e8 -s ours am: f3a6731fea -s ours am: b8d8478370 -s ours am: 42bb52f7e6 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 d61741288b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23860830

Change-Id: Ib014aef880453875237620621fbad141563c278c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:42 +00:00
Ioana Alexandru
b5720d3946 [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 88e597d2b3 am: 99424fe5e1 am: 177faa7623 am: 30d1344e4a am: 46c4c61a88 -s ours am: d0e0acd78b -s ours am: 266ed8754f -s ours am: d81d210a57 -s ours am: e59cf4d2f6 -s ours
am skip reason: skipped by user aioana

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23877020

Change-Id: I1297dbbedc56d7133c9bdb0cdd348b4d5fa7ac81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:39 +00:00
Treehugger Robot
bd87a4589d [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303ff -s ours am: 8bcc296564 -s ours am: 4c58d503e6 -s ours am: 92019fc099 -s ours am: 3a5c79c3f6 -s ours am: 345ee0b624 -s ours am: 7ac86c35ce -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861195

Change-Id: I36b695b0d7b5a5b72ed3d7e13b99a0221e09a957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:26 +00:00
Beth Thibodeau
8d61b0de80 [automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a0e -s ours am: 28203b9640 -s ours am: 6f8b219eb1 -s ours am: 8233aa715e -s ours am: cffddc61a7 -s ours am: 36595b2539 -s ours am: c76c9b77cb -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861195

Change-Id: I6b7aae43a7613664c578836e7b9d93ad6018da1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:23 +00:00
Dmitry Dementyev
8f1cadb895 [automerger skipped] Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531 am: c0cf1e4a4f am: a2473bfbcf am: efd4924e2a -s ours am: 63714628bb -s ours am: 089d124b7b -s ours am: 08c82aeae2 -s ours
am skip reason: Merged-In Ia2030a9dc371dccadd4e188a529351ac4232bb4f with SHA-1 8476b140ee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016

Change-Id: I093fabfca8820b8a8d5267b50efddfb779c24569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:10 +00:00
Treehugger Robot
1b43968904 [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c04 -s ours am: 1a214343af -s ours am: 6ac657ef80 -s ours am: a13e8f7c1f -s ours am: 791ffd50f7 -s ours am: b14a8f9b00 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 5eb6073925 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861644

Change-Id: I7973c9d5b6bb1c3e151b32074cb61e493b21fade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:08 +00:00
Beth Thibodeau
71e6e0bce4 [automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f51 -s ours am: 3527030292 -s ours am: d8080f187c -s ours am: 050f2c7b2f -s ours am: 308dca558b -s ours am: 73a58abff9 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 5eb6073925 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861644

Change-Id: Ia99e92d8d9a7713cd1d2ce528b0c4fa5fc4b27ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:49:03 +00:00