Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
765,569 Commits 3 Branches 0 Tags
69ff110d4aeeee9ca6a2d7eb48ba36d129ba4329
Commit Graph

765569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri Lin
69ff110d4a [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into rvc-dev am: 6df0223ee6 -s ours am: 3809613ecd -s ours am: 6ae0f72e44 -s ours am: a2966f173d -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history

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

Change-Id: Ida24067536412946e23cbcbbe37d5cd2c530b11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:29:02 +00:00
Yuri Lin
e7500c553f [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 1fcd99f5aa -s ours am: b7b76c0b92 -s ours am: fa763850dd -s ours am: 727863dae4 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history

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

Change-Id: I86ec27d3ca9a6d397725f04ede22b962b74147b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:28:38 +00:00
Yuri Lin
0a28e73771 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into rvc-qpr-dev am: 0b50f9cd27 -s ours am: c74c781cfd -s ours am: c1a83dd3f9 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history

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

Change-Id: Ib4e46c4cda9b54e97d94327a39d45cfde14d0f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:25:44 +00:00
Yuri Lin
0ce82a0d20 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 5b0c4af9ba -s ours am: f98751379a -s ours am: 9e9c2c149b -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history

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

Change-Id: I2afe9775bf42348bcc4127e7117be03f2f783cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:25:27 +00:00
Liana Kazanova
14549f9099 Merge "[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360" into sc-dev am: b62eeefe44 am: 2499b96081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087

Change-Id: I0d55e639b3ed40374acc1268edf2279547f6a78c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:23:59 +00:00
Yuri Lin
53e03640ee [automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into sc-dev am: 74f4246a9f -s ours am: b82c4ea941 -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history

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

Change-Id: Id213a9ca1adf8f743ab5d855b76f5b30ec13c21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:21:11 +00:00
Yuri Lin
1009c7d3f2 [automerger skipped] Merge changes from topic "presubmit-am-5d70d7e9c9634af1b0b082cbc89e0dad-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: af915107ab -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 b8c4819ec2 is already in history

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

Change-Id: I924fbffb20a90bb1970d94c2cb17e73c5fa17a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:11:38 +00:00
Yuri Lin
def2025bd8 [automerger skipped] [automerge] Fix system zen rules by using owner package name if caller is system 2p: 78245566a2 am: 429872b0e0 -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 b8c4819ec2 is already in history

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

Change-Id: I6d9c5b712a2b4db46a17316527754b0c0e096fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:11:12 +00:00
Yuri Lin
2a276b65f5 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: 416fa055a0 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history

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

Change-Id: Ib3e974a0422d69bb7f02dfaccc5f9c509444c2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:06:32 +00:00
Yuri Lin
d19735f042 Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: acb4c9b751 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496

Change-Id: Iee9ff0b52ad2a3ca983c91ace4d0bad53ccbb4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:56:35 +00:00
Automerger Merge Worker
c78b6a4495 Merge "[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c578 am: b5e74c1c7e -s ours am: 8cfe99d2e5 -s ours am: 167fa8ba83 -s ours" into sc-dev am: 8449f44bcf -s ours am: 3e44a311d5 -s ours 
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history

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

Change-Id: I70d30f9d5deef6c3648c72ed9abef0e7f7c190be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:54:00 +00:00
Yuri Lin
fc43787984 [automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c578 am: b5e74c1c7e -s ours am: 8cfe99d2e5 -s ours am: 167fa8ba83 -s ours am: 8583d6eac1 -s ours am: 8835849598 -s ours 
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 3201baad70 is already in history

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

Change-Id: I30b5e95c0bffdb60401f1fab06412be7674e30df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:53:19 +00:00
Yuri Lin
dec8a6fc5b Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-dev am: 269deccf66 am: cc4ac51a4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748653

Change-Id: Ie5d0bce53e4bced7b7aab92afc8ca827c5e3f35a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:52:07 +00:00
Yuri Lin
4952fd8b21 Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into sc-mainline-prod am: b47527946c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748653

Change-Id: I0769387b5870fd9a73ac11d39ca7297ddc8c97c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:50:26 +00:00
Yuri Lin
8c4413db49 [automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 3201baad70 -s ours am: 6966525094 -s ours am: a35e748eaf -s ours am: 9bb31521fc -s ours 
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 df439a438f is already in history

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

Change-Id: I48551cac145fd25c4387df695ad5d7e1e6548a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:49:49 +00:00
Yuri Lin
fa1cf1f77b [automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: df439a438f -s ours am: a1bbd7860a -s ours am: 93c1930eb1 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I5284364927b71b048785594d8e6bbb65ee136a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:49:09 +00:00
Ganesh Olekar
2fb421510b [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev am: 391cabb10c am: 4239eb38e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7b07ff75f5351b98a4d03343babde60d22e8e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:47:54 +00:00
Ganesh Olekar
c88821b71b Merge changes from topic "scdevbug" into sc-mainline-prod am: 1309cfa824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370

Change-Id: Ia6afba845fdd17ed47909030a80bd050cec10d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:46:52 +00:00
TreeHugger Robot
07adc3ac7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 096b3f466d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4a8895cef34f456a2892848fa0797dd4a09fe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:44:47 +00:00
TreeHugger Robot
105501ae7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 190f79492d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77780ba6354ead281da3379cba8ae37e2394950c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:43:17 +00:00
TreeHugger Robot
6592a2f307 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 79787457a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e3d5652c451a7e446d30eddeaee9f23c9219ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:39:34 +00:00
TreeHugger Robot
00f4e53437 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: c5b25ef847 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22a33757439e7d9358741edffc9ea712066fbb2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:35:21 +00:00
TreeHugger Robot
3e9a16df76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d2a94ce448 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2da11fe2b3ece87c0c89e78a1fe4939f606ea6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:32:11 +00:00
Brian Egizi
7921912f19 [manual merge] Import translations. DO NOT MERGE ANYWHERE 
Change-Id: Ib11d9f837b0c2b6c59d28457a89b78ca693d05eb
 2023-02-23 19:38:29 +00:00
Paul Duffin
81a9f1a693 Add UpsideDownCake to aapt2 codenames 
Bug: 269470863
Test: m checkbuild
Merged-In: I2b668d1cd875657b27a1d52bda21f238d7020862
Change-Id: Ic3a624a3d2696ecbbe9c079094362b01e8953365
 2023-02-23 15:22:32 +00:00
Patrick Baumann
20aacbf012 Revert "Add UpsideDownCake to aapt2 codenames and android.os.Build" 
This reverts commit e422b7da01.

Reason for revert: Test failures on tm-branches b/269588126

Change-Id: I529eba46a1c341e75b02b59432e011fada8ae648
Bug: 269470863
Fixes: 269588126
Merged-In: Icb6ad340bfea7109aac9b74c6fb5165c030df16c
 2023-02-23 15:22:10 +00:00
TreeHugger Robot
a62ebeca21 Merge "Uri: check authority and scheme as part of determining URI path" into sc-dev am: d632a3978a am: 245d1e63a2 am: ce7acafd5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373610

Change-Id: I3fd7d0719d6f846cf04f58a10824ea90fa4e639e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 22:12:02 +00:00
Varun Shah
404564317f Merge "Uri: check authority and scheme as part of determining URI path" into rvc-qpr-dev am: 961de63f19 am: 690fe8cd1a am: d74c5d0ace am: 4c69e06502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373665

Change-Id: I727d12734055bee14c791587fc48dd79a814adaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 22:11:34 +00:00
TreeHugger Robot
aa9593d98b Merge changes from topic "uri-logic-sc-dev" into sc-qpr1-dev am: 9531dc43b0 am: 87f472aec2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373610

Change-Id: Ie6b94772b37c3982b2b9c4258c55a2a35b49340a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 22:10:39 +00:00
TreeHugger Robot
ce7acafd5f Merge "Uri: check authority and scheme as part of determining URI path" into sc-dev am: d632a3978a am: 245d1e63a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373610

Change-Id: I07ab2489530f453ecb8ba6255b5f55b915e5c899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:36:20 +00:00
Varun Shah
4c69e06502 Merge "Uri: check authority and scheme as part of determining URI path" into rvc-qpr-dev am: 961de63f19 am: 690fe8cd1a am: d74c5d0ace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373665

Change-Id: Ib0508b73d83ebeb18d185ad91be3fa680b7d5a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:36:08 +00:00
TreeHugger Robot
87f472aec2 Merge changes from topic "uri-logic-sc-dev" into sc-qpr1-dev am: 9531dc43b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373610

Change-Id: I4850aa7b574099aefdb2f99da4f88106cc5528e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:35:55 +00:00
TreeHugger Robot
e22cbd62bf [automerger skipped] Merge "Uri: check authority and scheme as part of determining URI path" into rvc-dev am: 546d9f8e41 am: 2f784d6dc1 am: ef33ed2993 -s ours am: 8725bfd850 -s ours am: 05aeb28226 -s ours 
am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 ad80758027 is already in history

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

Change-Id: Ic45e455ab530bb2af74ebf377fb35a31736b33e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:08:12 +00:00
TreeHugger Robot
245d1e63a2 Merge "Uri: check authority and scheme as part of determining URI path" into sc-dev am: d632a3978a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373610

Change-Id: Iacc8b3ddac9a296269296fb8a10e8a6cb1a8a077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:51:01 +00:00
Varun Shah
d74c5d0ace Merge "Uri: check authority and scheme as part of determining URI path" into rvc-qpr-dev am: 961de63f19 am: 690fe8cd1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373665

Change-Id: Ic8885fcf85fd4b2391cfa5caa6960209359e26f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:50:43 +00:00
Varun Shah
1d592864e9 Merge "Uri: check authority and scheme as part of determining URI path" into sc-qpr1-dev am: fa9fe6fcdf am: 66ebfd2d7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373663

Change-Id: I1c13ccc383f573c22dd582692b7a5dbb5951639b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:50:06 +00:00
TreeHugger Robot
d632a3978a Merge "Uri: check authority and scheme as part of determining URI path" into sc-dev 2023-02-22 20:46:05 +00:00
TreeHugger Robot
9531dc43b0 Merge changes from topic "uri-logic-sc-dev" into sc-qpr1-dev 
* changes:
  [automerge] Uri: check authority and scheme as part of determining URI path 2p: d83281c730
  Uri: check authority and scheme as part of determining URI path
 2023-02-22 20:46:03 +00:00
TreeHugger Robot
05aeb28226 [automerger skipped] Merge "Uri: check authority and scheme as part of determining URI path" into rvc-dev am: 546d9f8e41 am: 2f784d6dc1 am: ef33ed2993 -s ours am: 8725bfd850 -s ours 
am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 ad80758027 is already in history

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

Change-Id: I0c2edee02880f3f02c0320a93220144db5ea35b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:17:18 +00:00
Varun Shah
66ebfd2d7c Merge "Uri: check authority and scheme as part of determining URI path" into sc-qpr1-dev am: fa9fe6fcdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373663

Change-Id: I9c49571e8aaab8e6c848d89c9a7a79b6a29f8df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:16:30 +00:00
Varun Shah
690fe8cd1a Merge "Uri: check authority and scheme as part of determining URI path" into rvc-qpr-dev am: 961de63f19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373665

Change-Id: I22249be0ba720c81a2a4e409627781209b371749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:13:02 +00:00
TreeHugger Robot
8725bfd850 [automerger skipped] Merge "Uri: check authority and scheme as part of determining URI path" into rvc-dev am: 546d9f8e41 am: 2f784d6dc1 am: ef33ed2993 -s ours 
am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 ad80758027 is already in history

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

Change-Id: Ieaecea4ae766c0b9afd8029b03d5ed55c0af4504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:32:46 +00:00
Varun Shah
fa9fe6fcdf Merge "Uri: check authority and scheme as part of determining URI path" into sc-qpr1-dev 2023-02-22 19:24:08 +00:00
Varun Shah
961de63f19 Merge "Uri: check authority and scheme as part of determining URI path" into rvc-qpr-dev 2023-02-22 19:23:45 +00:00
TreeHugger Robot
ef33ed2993 Merge "Uri: check authority and scheme as part of determining URI path" into rvc-dev am: 546d9f8e41 am: 2f784d6dc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695640

Change-Id: I8702aa3aef5cbb1b1865b3ed5c9382119d99d18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:37:10 +00:00
TreeHugger Robot
950fe471eb [automerger skipped] Merge "Uri: check authority and scheme as part of determining URI path" into sc-v2-dev am: 1be7808e51 -s ours 
am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 e082ece64f is already in history

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

Change-Id: I18aed40b741962331ccb2ef5b0c8d4c0fed4478e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 17:59:40 +00:00
Orion Hodson
77a8366257 [automerger skipped] Uri: check authority and scheme as part of determining URI path am: dcc1fb8e8b -s ours 
am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 e082ece64f is already in history

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

Change-Id: I84c87273f7e3d2dc4521671bb03db6ee683d311e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 17:59:06 +00:00
TreeHugger Robot
2f784d6dc1 Merge "Uri: check authority and scheme as part of determining URI path" into rvc-dev am: 546d9f8e41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695640

Change-Id: Ib3ee2cee24ae3d93b4af61756718c20a4adb7910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 17:58:55 +00:00
TreeHugger Robot
1be7808e51 Merge "Uri: check authority and scheme as part of determining URI path" into sc-v2-dev 2023-02-22 16:54:36 +00:00
TreeHugger Robot
546d9f8e41 Merge "Uri: check authority and scheme as part of determining URI path" into rvc-dev 2023-02-22 16:41:07 +00:00