Age | Commit message (Collapse) | Author |
|
mainline-networking-release
Change-Id: I459e19b6f4ac55e19d0395f25de23846ba8c7a26
|
|
Bug: 263816046
Test: manual
Change-Id: Ibae437bf9b5ed51b80030a4f172301e0073c513b
|
|
mainline-networking-release
Change-Id: I2cfdd56d8054f7c46d260e6f0fb8e955468ca075
|
|
Required for some blueprint file re-structuring in libcore.
Bug: 255273691
Bug: 255275437
Test: m
Change-Id: I71040aeb29b4c985b9e84a123295791530206d45
Merged-In: I71040aeb29b4c985b9e84a123295791530206d45
(cherry picked from commit e86d5b03c5a6b1621800c1dfec86c372377dc7ea)
|
|
mainline-networking-release
Change-Id: Icfa1cc715bce741bcf214c746666f35cf0af376c
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386
Change-Id: I98ec18d0b6e221d620c710c456637f6618dac5f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Test: mma in /external/robolectric
Bug: 244627502
Change-Id: Iea16ea478624c054540ddaeb177adf12ccb0abc3
Merged-In: Iea16ea478624c054540ddaeb177adf12ccb0abc3
|
|
mainline-networking-release
Change-Id: Id48f2a84e34efccc8954731d20d91225abc97f20
|
|
AdServices module" into tm-mainline-prod
|
|
Test: Presubmits
Change-Id: Iccc42fd82b1b798550857c8fca0f2dae0f891569
Bug: b/237838314
Merged-In: I6e65e4f91c847fcbb39fe5e25a61b7d7e3a1296c
|
|
Previously, the sdk snapshot would include all modules listed as
members for each build release even when the module specified that
it was not suitable for that release, by virtue of having a
min_sdk_version > target build release. A follow up change in
build/soong will exclude any module whose min_sdk_version > target
build release from the sdk snapshot for that build release.
Unfortunately, not every sdk member has a min_sdk_version specified. In
that case it defaults to use the sdk_version and if that is not
specified then it defaults to the "current" API level. Modules that are
also part of an updatable APEX are required to have a min_sdk_version
but other modules are not which means that those modules will not
appear in any snapshot other than the latest one.
This change adds a min_sdk_version: "S" property to the
okhttp-norepackage library to make sure that it will continue to be
included in the sdk snapshot for S+ once the follow up change is
applied.
Bug: 240406019
Test: packages/modules/common/build/mainline_modules_sdks.sh
# Ran the previous command with and without this change to make
# sure that this change does not change the sdk snapshot
# contents. Also ran the previous command with the follow up
# change in build/soong to make sure that it does not change the
# sdk snapshot either.
Change-Id: I3fc3dfe867bd7687585cc16078c6b68b58190eb4
(cherry picked from commit 6ae7083ae1677a164b48d4b2713bf9a06a535b0e)
Merged-In: I3fc3dfe867bd7687585cc16078c6b68b58190eb4
|
|
mainline-networking-release
Change-Id: I9a7377f30385f3df04ab7bb17a1a076e0321c20c
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am: f7ed88329e -s ours am: e6f20599f9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: Id7af56bc0542022a8f3ed1d8dab78232066eba70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: 24a643da8e -s ours am: 76fc8f4998 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: Ifd93575e327fe31c6ec84c26667b1449ce43b3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am: f7ed88329e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: Ia991f18204d446c63e50a71d53fedf4e66b983d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: I07109f3176ff7db66caa6a696fa9568377b9ab70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: 24a643da8e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: I437d923d66a06292de56234ec118824f504dd707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: Iae9b11abd745889acef5a73eab7117c02b63904f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: I504efbe6f64609596a3b1c4a13095c89e226c52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: I6a510885194b350863e829b4e1a112311a934c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: I31f0fff137dd7aabe0efbb84450c37fc6de73b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
match source. am: d101e9eff4 am: 35d92595a5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: I684a2d45fc381abe25131dc5f175abe788f57acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868
Change-Id: Ica0ed13be3743ca71c48f82792da59fd89e1b935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
The fix for CVE-2021-0341 in qt-dev was cherry-picked from
pi-dev. However while the repackaged okhttp files did not
required merging for pi-dev, they *do* for qt-dev and beyond. This
change merges them in qt-dev, and qt-qpr2-dev after automerging.
Is set to do not merge as the fix was applied correctly to
rvc-dev and all branches downstream of that.
Bug: 171980069
Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases
Change-Id: Ic47bb42d68c768277be0a8677cd9830ee03ff293
|
|
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba am: b6821f6df2 am: 8b36497875
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: I736519c5348372bf2b31e6badd7da4466d4193e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba am: b6821f6df2
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: I790f56c7590314d0f75c2abdd1240dcf81411d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: Ie62ee893e877e37103ac9605758f3f3f66c4b15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: I44e05c4728f0c9b9fd50a7d401677a1a3df97ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472"
|
|
android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: I289716aa1d1d3015089379c2122ee4a12d3f6d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev
|
|
android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: I64c502f56d4f015b3db0837b1a762698bf52fe2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
android11-tests-dev am: fbc842a7a8" into android12-tests-dev
|
|
android11-tests-dev am: fbc842a7a8
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: I53d2f913dbe04ec18213a58c1e6fcccf551de6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
android11-tests-dev
|
|
This is a backport of upstream commit
https://github.com/square/okhttp/commit/45e44a390cd287a141dc0f446038169608294879
> OEMs have found some configurations of Android devices that cannot
> meet the timeout. This change doubles the timeout from 30 to 60
> seconds.
>
> The Android bug reference is 27273056.
Bug: 210828057
Test: atest 'CtsLibcoreOkHttpTestCases:com.squareup.okhttp.internal.DiskLruCacheTest#rebuildJournalOnRepeatedEdits'
Change-Id: I62f8d89601b8cb80bb2e14b23f0063d70913e394
|
|
"am-33761c75a1d240df8af3b3cd1fd22513" am: b88f171140 -s ours am: 3725791079 -s ours am: 95122d4e47 -s ours am: 2ee78fbb51 -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: Ief0dcc1403ee3418a540de270e63b887c7301b31
|
|
android12L-tests-dev am: 4c2ad95006 -s ours am: 2a9fd72da0 -s ours am: b894b54191 -s ours am: db430227bd -s ours am: 138baeef1a -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: I1abab45cceb8f56ce881cd1ebec09a759c4d9129
|
|
"am-33761c75a1d240df8af3b3cd1fd22513" am: b88f171140 -s ours am: 3725791079 -s ours am: 95122d4e47 -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: I07edc0d51ed40b3e83c41e98c1dfc92925a95c71
|
|
android12L-tests-dev am: 4c2ad95006 -s ours am: 2a9fd72da0 -s ours am: b894b54191 -s ours am: db430227bd -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: Id944c781c7a56d8a6719770b2169c9154dd1cecc
|
|
"am-33761c75a1d240df8af3b3cd1fd22513" am: b88f171140 -s ours am: 3725791079 -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: I55d292e93d233e3de88382a902947f14990309b3
|
|
android12L-tests-dev am: 4c2ad95006 -s ours am: 2a9fd72da0 -s ours am: b894b54191 -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: Ia857d3b712b33d0301b748dedc96ef0db5c27dd5
|
|
"am-33761c75a1d240df8af3b3cd1fd22513" am: b88f171140 -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: I13ed2d9808fdbb69262f958fd23b76ac58d8a56a
|
|
android12L-tests-dev am: 4c2ad95006 -s ours am: 2a9fd72da0 -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: I9ea97be47fc8ee82541ce30162a11ac16fca9b36
|
|
* changes:
[automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: 4c2ad95006 -s ours
[automerger skipped] Mark ab/8191998 as merged am: f3206b6aca -s ours
|
|
android12L-tests-dev am: 4c2ad95006 -s ours
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: I832dd1e472b82cc677bdd8ee7f7b1730036c58eb
|
|
am skip reason: Merged-In Ie673edf348722de577fd491efb27973d38456997 with SHA-1 a455bf01b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2036666
Change-Id: I11612d438300c70fbf7489d6d14ff8c0c5de177b
|
|
|
|
Bug: 188847863
Merged-In: Ie673edf348722de577fd491efb27973d38456997
Change-Id: Ie26d073f162cccc0c08f7dc79bf66d868466a549
|
|
ConnectionSpecTest for cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours" into android10-tests-dev am: e401e4be0e -s ours" into android11-tests-dev am: 9de132a5d5 -s ours" into android12-tests-dev
|