Commit Graph

766887 Commits

Author SHA1 Message Date
Treehugger Robot
7bcfc61d96 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours am: e48e6ed9f9 -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: I5be0265f4fcd99af38c1646cd4f8c6bc103e7d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:42:51 +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
Treehugger Robot
e48e6ed9f9 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -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: I4e450886397aee13509979d82a2eb07824d13368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:05:50 +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
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
Treehugger Robot
04b584c402 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -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: I0af03a25f80cda0f9816dcad4efe77dd4d74bc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:20:29 +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
Treehugger Robot
354583d7f1 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -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: Ic0f26b17a8c00131c925f2ea595121adade13132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 15:38:33 +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
Treehugger Robot
41cce389fd [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -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: Ic6f864ca5657f61b9511a609077c2c844dcc4c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 14:54:38 +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
Treehugger Robot
e597df6fd0 Merge "Improve user handling when querying for resumable media" into rvc-dev 2023-07-10 14:10:21 +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
3a5c79c3f6 [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 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: Ib7a3befee47c3fef6be8268b38884162f829b46d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:46:32 +00:00
Beth Thibodeau
cffddc61a7 [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 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: I75c932ccb1de924af281035cbc3b7e16e1d2d011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:46:13 +00:00
Treehugger Robot
a13e8f7c1f [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 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: I25387a7d09101780e8d2bee497fe7336b0a49ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:45:45 +00:00
Beth Thibodeau
050f2c7b2f [automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f51 -s ours am: 3527030292 -s ours am: d8080f187c -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: Ia0c419c8ddf2846253cbedced99f390ba15ccd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:45:28 +00:00
Treehugger Robot
a364fe8a3f [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev am: 3554a4a7ed -s ours am: 5db6d9c6d4 -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: I9b7c5404402a901b9cbbccefeb2d301a423c2f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:44:53 +00:00
Beth Thibodeau
75d61fabcf [automerger skipped] Improve user handling when querying for resumable media am: 5eb6073925 -s ours am: cfa9b693b9 -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: I04c20131e5892448bcd773a05b334a1b1ffa969b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:44:38 +00:00
Beth Thibodeau
93b178dce7 [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-v2-dev am: dd1fb1e5b7 -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: I6e3f696cb3fe35f8e3a4a8ae0acfca0afedf6136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:43:51 +00:00
Beth Thibodeau
f3a6731fea [automerger skipped] Improve user handling when querying for resumable media am: b7e77454e8 -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: I4172812cb9de56f0dece65baa1cb699565b9bef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:43:18 +00:00
Dmitry Dementyev
63714628bb [automerger skipped] Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531 am: c0cf1e4a4f am: a2473bfbcf am: efd4924e2a -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: I85dd3cae539e26c1e928ef91ab48bf043010c85a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:42:07 +00:00
Josep del Río
b3bb4cfe8a Merge "Do not share key mappings with JNI object" into sc-dev am: 4a45e9c435 am: 77cbfcd9a8 am: c6952e05d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23785419

Change-Id: Ib26aa99595bdf036d8aaaa4261ed16f5a2696bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:41:05 +00:00
Treehugger Robot
39aa5318b6 [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 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: I869b7b11f09b4ca2aab160f22a443c650b5ce8a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:40:04 +00:00
Ioana Alexandru
d0e0acd78b [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 88e597d2b3 am: 99424fe5e1 am: 177faa7623 am: 30d1344e4a am: 46c4c61a88 -s ours
am skip reason: skipped by user aioana

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

Change-Id: Idcd00c6633727ccfc6930a65dd863bcef61f2ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 09:39:18 +00:00
Treehugger Robot
92019fc099 [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 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: I6dae0070b552d947d176a698674dc43460f8d1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 23:08:51 +00:00
Beth Thibodeau
8233aa715e [automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a0e -s ours am: 28203b9640 -s ours am: 6f8b219eb1 -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: Ife29ba82830e52bf694788977c79ad097fa61825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 23:08:33 +00:00
Treehugger Robot
4c58d503e6 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303ff -s ours am: 8bcc296564 -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: Idfaab170a8c2fe5e7ceb7c60d6b9b7376b45ddb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 22:25:57 +00:00
Beth Thibodeau
6f8b219eb1 [automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a0e -s ours am: 28203b9640 -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: Idb514e32bda02ca33a336c94a06350779a86f834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 22:25:53 +00:00
Treehugger Robot
8bcc296564 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303ff -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: I8cbf4f68a72b6aea2b703764cf5949bcf74ee6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 21:44:58 +00:00
Beth Thibodeau
28203b9640 [automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a0e -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: I8a7aaf4b54a5876f039f42e248b8b91ffbaa07d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 21:44:31 +00:00
Treehugger Robot
3b8eb303ff Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev 2023-07-09 21:18:22 +00:00
Treehugger Robot
6ac657ef80 [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c04 -s ours am: 1a214343af -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: I436d137dc25c6432331dcf8e17a4532f8d840a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 18:51:25 +00:00
Beth Thibodeau
d8080f187c [automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f51 -s ours am: 3527030292 -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: I1de627d8c2581e43104a8669f0d2b62109e9883f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 18:51:15 +00:00
Treehugger Robot
1a214343af [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c04 -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: I7cb898e4a3f8db0660f3c812935c0fd25236f6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 18:08:43 +00:00
Beth Thibodeau
3527030292 [automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f51 -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: I87c511e4baac95b23cc30055b781258019ebb7eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 18:08:32 +00:00
Treehugger Robot
e675984c04 Merge "Improve user handling when querying for resumable media" into sc-dev 2023-07-09 17:35:21 +00:00
Treehugger Robot
5db6d9c6d4 [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev am: 3554a4a7ed -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: I89d3043e387cec2a80289d9dccba6474144e9cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 04:41:23 +00:00
Beth Thibodeau
cfa9b693b9 [automerger skipped] Improve user handling when querying for resumable media am: 5eb6073925 -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: I67ffc8d8e775734fe7ec9972d5d643723445c874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 04:41:18 +00:00
Treehugger Robot
3554a4a7ed Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev 2023-07-09 04:12:10 +00:00
Beth Thibodeau
dd1fb1e5b7 Merge "Improve user handling when querying for resumable media" into sc-v2-dev 2023-07-09 02:12:00 +00:00
Dmitry Dementyev
efd4924e2a Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531 am: c0cf1e4a4f am: a2473bfbcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016

Change-Id: I51df39b6623f421e08c6ceab8f5724a505b86070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 00:49:20 +00:00
Dmitry Dementyev
a2473bfbcf Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531 am: c0cf1e4a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016

Change-Id: I9504969069c4af457fad151d087d177e5bea14aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-09 00:07:11 +00:00
Dmitry Dementyev
c0cf1e4a4f Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016

Change-Id: Iad68a062c2d0131ef9ef1c0e53d02a64c41af569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 23:25:43 +00:00
Dmitry Dementyev
8271466531 Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016

Change-Id: I81e8a60cc87842a971a3cab00b9d46dcd4f0f564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 22:40:48 +00:00
Dmitry Dementyev
d40861be65 Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev 2023-07-08 21:55:42 +00:00