Merge "Add some more public doc for MacAddress" am: a9a005de38 am: b81882f72c am: 2a4eed1edf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I52460b43a5d225668714c44fb5804899feb3b83a
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-08 05:51:01 +00:00
73542e440b
Merge "Add some more public doc for MacAddress" am: a9a005de38 am: b81882f72c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I5c9061fa832c75c9e0476c54bacec3deb114a96d
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-08 05:38:59 +00:00
2a4eed1edf
Merge "Add some more public doc for MacAddress" am: a9a005de38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I1126b78eb886c5c84afa107b028fe2569d7573e4
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-08 05:29:56 +00:00
b81882f72c
Merge "Add some more public doc for MacAddress"
Chalard Jean
authored and
Gerrit Code Review
commited 2020-07-08 05:15:20 +00:00
a9a005de38
Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)
...
Update all callers to use ProxyInfo(Uri) and remove ProxyInfo(String).
Bug: 160557668
Test: build pass
atest FrameworksNetTests
Change-Id: I4c980764c8839c48acf03208bb68cd53eb910121
Aaron Huang
commited 2020-07-06 11:59:27 +00:00
77acd4c2e7
Add some more public doc for MacAddress
...
Bug: 140807677
Test: doc-only change
Change-Id: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
Chalard Jean
commited 2020-07-04 09:01:58 +09:00
bf8723b002
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5 am: 70655e6270 am: 934d3eabf7 am: 59bcef85b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I6f3630bc0b1fa148f7ec8d01c339803855e985ab
Pavel Grafov
authored and
Automerger Merge Worker
commited 2020-07-03 12:02:44 +00:00
2161a10df2
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5 am: 70655e6270 am: 934d3eabf7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I2b42c88920c59bc26e2a6531e1812fa6afe9650a
Pavel Grafov
authored and
Automerger Merge Worker
commited 2020-07-03 11:50:34 +00:00
59bcef85b5
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5 am: 70655e6270
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I5bb6267ca876df8aef0b2df630c058726b195352
Pavel Grafov
authored and
Automerger Merge Worker
commited 2020-07-03 11:38:59 +00:00
934d3eabf7
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I31aa41a6268d88178c4a3f276c7ea7750695b417
Pavel Grafov
authored and
Automerger Merge Worker
commited 2020-07-03 11:13:01 +00:00
70655e6270
Merge "Connectivity: start PAC global proxy after reboot."
Pavel Grafov
authored and
Gerrit Code Review
commited 2020-07-03 10:54:10 +00:00
840c688ba5
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: a11688cabc -s ours am: e283f049b8 -s ours am: 54347a850e -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: I488aaec3e0edf160d30063c20090d428a0128b68
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-07-03 02:04:29 +00:00
b5a61e1b72
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: a11688cabc -s ours am: e283f049b8 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: I8f5a2c331176a3e1a2c11aebe65a6a8799f309a2
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-07-03 01:53:51 +00:00
54347a850e
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: a11688cabc -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: Ie3cef51a714de2c9111554c84a5e7aba49a4818f
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-07-03 01:36:29 +00:00
e283f049b8
Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: I472fd717d82304e4362c3075805b460b02a197e0
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-07-03 00:54:07 +00:00
a11688cabc
Revert "Move Inet[4]AddressUtils to libs/net"
...
This reverts commit 3cb7ccd0cd .
Reason for revert: Breaks the build b/160390899
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44
Chalard Jean
authored and
Remi NGUYEN VAN
commited 2020-07-02 23:47:35 +00:00
a2706a1710
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: a37a71537c -s ours am: 5d135a2b4e -s ours am: 8d12e47949 -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 68bdb5ac9e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I50f022d349da36cb90e1fa3fc250659511d42d04
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2020-07-02 10:03:06 +00:00
961de163ab
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: a37a71537c -s ours am: 5d135a2b4e -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 68bdb5ac9e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iad6a186fda02f69741ef0a2403e16973300bae1e
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2020-07-02 09:52:45 +00:00
8d12e47949
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: a37a71537c -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 68bdb5ac9e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iae9c8eb2e17130737e4cd30b03c4d20afbae6dc8
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2020-07-02 09:39:11 +00:00
5d135a2b4e
Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I51d32e4efd0d9fc458b02022b6308920f7c812a9
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2020-07-02 09:21:23 +00:00
a37a71537c
Move Inet[4]AddressUtils to libs/net
...
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.
Also refine comments in DhcpResults following feedback in previous
change.
(cherry-pick from internal branch skipping wifi classes; no other
conflict)
Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
Remi NGUYEN VAN
commited 2020-07-02 10:52:31 +09:00
3cb7ccd0cd
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 2345894c5a am: 36824bfbd5 am: 3ace30afac am: e28bee0bc3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: I3b9c83c31f275ee1ea8cbd44002b2a3bd19f8763
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-01 05:58:07 +00:00
ba0530faa4
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 2345894c5a am: 36824bfbd5 am: 3ace30afac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: I5e7c7d0d6dd93d6b2203a9a8caa7acc38fae75e0
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-01 05:47:13 +00:00
e28bee0bc3
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 2345894c5a am: 36824bfbd5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: Ibc8d633a6e04f7cd0f4c1a0d02ae586232cc0c6a
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-01 05:33:41 +00:00
3ace30afac
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 2345894c5a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: I837da6368ab0492c5c65afba4e6cb388d526199d
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-01 05:21:03 +00:00
36824bfbd5
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib...""
Chalard Jean
authored and
Gerrit Code Review
commited 2020-07-01 05:12:40 +00:00
2345894c5a
Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."
...
Revert "Add new network quirk parcelable in the NetworkAttributes."
Revert submission 1323251-ipv6_prov_loss_quirk_parcelable
Reason for revert: Breaks CtsStrictJavaPackagesTestCases
Reverted Changes:
I18e05c09f:Add new network quirk parcelable in the NetworkAtt...
I8dbff2377:Test IPv6ProvisioningLossParcelable in the Network...
Change-Id: Ie906919b344131cd768fbed787248d3caac2f74d
Chalard Jean
commited 2020-07-01 01:46:26 +00:00
24ed491f88
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9 am: 0df54895ad am: 400b2769fa am: 7eafd58b80
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: Ib8f6ee477924804ad96dc9d8b2a24eb3d0445746
Xiao Ma
authored and
Automerger Merge Worker
commited 2020-06-29 12:42:09 +00:00
9093db72d8
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5 am: 3d1867013e am: 3a3bba00a6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: I97d47176f79203e4bd6eb08e12c203c61d93cacb
Paul Hu
authored and
Automerger Merge Worker
commited 2020-06-29 12:41:12 +00:00
5e0c39fe2a
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9 am: 0df54895ad am: 400b2769fa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: Id024f3d8fff3df18900a9dd2bae0d655901722d0
Xiao Ma
authored and
Automerger Merge Worker
commited 2020-06-29 12:31:30 +00:00
7eafd58b80
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5 am: 3d1867013e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: Ic19f6bd30a1e70b5887719d730ce08bc0539ec10
Paul Hu
authored and
Automerger Merge Worker
commited 2020-06-29 12:30:59 +00:00
3a3bba00a6
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9 am: 0df54895ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: Iaf964024c44e6b78ccb3b8fcf3fc131479747a81
Xiao Ma
authored and
Automerger Merge Worker
commited 2020-06-29 12:17:26 +00:00
400b2769fa
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: Ida8f82d2ec5be1040a2bdf2aa65a94d53f68ea6c
Paul Hu
authored and
Automerger Merge Worker
commited 2020-06-29 12:16:47 +00:00
3d1867013e
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: I2f6870d0a6b4e52e484f926d86352f6dcd393cca
Xiao Ma
authored and
Automerger Merge Worker
commited 2020-06-29 12:04:24 +00:00
0df54895ad
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: I0c7f6ab65220eaf0169fb4d88f9aec023ab33228
Paul Hu
authored and
Automerger Merge Worker
commited 2020-06-29 12:03:56 +00:00
18da2dcce5
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes."
Xiao Ma
authored and
Gerrit Code Review
commited 2020-06-29 11:58:24 +00:00
1f6c6479b9
Test IPv6ProvisioningLossParcelable in the NetworkAttributes.
...
Bug: 157534516
Test: atest FrameworksNetTests
Change-Id: I8dbff2377457bb8fd0f447be0a3cda9af952f2a2
Xiao Ma
commited 2020-06-29 11:57:32 +00:00
c2e0dc084a
Merge "[RFPM01] Merge package added/removed methods"
Paul Hu
authored and
Gerrit Code Review
commited 2020-06-29 11:50:57 +00:00
fac73070cc
Make change and version bump to r_aml_300802900 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Iff018565791817468a1103fbaee0ba638b89fb65
android-build-team Robot
commited 2020-06-27 03:31:45 +00:00
f0cd5ee1f0
Snap for 6634012 from b56a22487f9b492a70e5c8d79962cedb6f145568 to rvc-release
...
Change-Id: Ia8c9a3cfa1bd1024e0ef544db743edaa97ae30b8
android-build-team Robot
commited 2020-06-27 01:08:13 +00:00
b611411654
Merge "[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 5fafdd4695 -s ours" into rvc-d1-dev-plus-aosp am: baef81ce70 -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 aace2f48a9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: If79ab6c3a617346bc54308d8c75ece3f0616ef76
Automerger Merge Worker
commited 2020-06-26 15:50:08 +00:00
7a093e0f1a
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 am: 91f12bec0f -s ours am: 73c81fd812 -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b0174784bc is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I92e4babb140258d1f8ab2a6be57f24e7dca35c0c
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-06-26 15:49:50 +00:00
a854ec5c7e
Merge "[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 5fafdd4695 -s ours" into rvc-d1-dev-plus-aosp
Automerger Merge Worker
authored and
Android (Google) Code Review
commited 2020-06-26 15:34:00 +00:00
baef81ce70
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 5fafdd4695 -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b0174784bc is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I0c408a703c9de759cf569b1e8cbeb749fbf906df
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-06-26 15:33:51 +00:00
19f918e4b9
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 am: 91f12bec0f -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b0174784bc is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I55264ab00ba7646dde9e6c7b9a600258b8b992e2
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-06-26 15:33:41 +00:00
73c81fd812
Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I1562abb163e5ddf8a84bbac17d140d4fa1e54adf
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-06-26 15:21:45 +00:00
91f12bec0f
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b0174784bc is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I5d9f3dfaf49f78773c92f4c6dfefb95adb629ce8
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-06-26 15:21:24 +00:00
5fafdd4695
Merge "Send ConnDiags event before revalidating network in CS." am: a4e39ee58a am: ad069383bd am: 2323163720 am: 6b1c4f3cbd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662
Change-Id: Ie94d976b06c7e64cf3b45eb29b22ad8cb25e3198
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-06-26 08:19:30 +00:00
2ae2fcfba5
Merge "Send ConnDiags event before revalidating network in CS." am: a4e39ee58a am: ad069383bd am: 2323163720
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662
Change-Id: I8ccbf85a2e49c487424642bba5900239b3faff5f
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-06-26 08:07:20 +00:00
6b1c4f3cbd
Send ConnDiags event before revalidating network in CS.
...
This change updates ConnectivityService to notify the
ConnectivityDiagnosticsHandler of app-reported connectivity before
attempting to revalidate the network. This change forces an ordering on
Connectivity Diagnostics events in the case that the reported
connectivity does not match the known connectivity for the network -
this leads to the network being revalidated and the
ConnectivityDiagnostics event onConnectivityReportAvailable. Passing the
onNetworkConnectivityReported event to the
ConnectivityDiagnosticsHandler first ensures that it is passed to
callbacks before any potential ConnectivityReports are.
Bug: 159718782
Test: android.net.cts.ConnectivityDiagnosticsManagerTest
Original-Change: https://android-review.googlesource.com/1350662
Merged-In: Ic7bc7138c54c47bbfdf56af5811709fde66f8606
Change-Id: Ic7bc7138c54c47bbfdf56af5811709fde66f8606
Lorenzo Colitti
authored and
Chalard Jean
commited 2020-06-26 07:59:04 +00:00
aace2f48a9