Commit Graph

10844 Commits

Author SHA1 Message Date
Aaron Huang
ffb76492e0 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
2020-07-06 11:59:27 +00:00
Chalard Jean
ded38fda42 Add some more public doc for MacAddress
Bug: 140807677
Test: doc-only change
Change-Id: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
2020-07-04 09:01:58 +09:00
Pavel Grafov
d5f92e7c38 Merge "Connectivity: start PAC global proxy after reboot." am: 22fbf24ce4 am: 1f2605f517 am: 912a832de1 am: 5f79e49663
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599

Change-Id: I6f3630bc0b1fa148f7ec8d01c339803855e985ab
2020-07-03 12:02:44 +00:00
Pavel Grafov
5f79e49663 Merge "Connectivity: start PAC global proxy after reboot." am: 22fbf24ce4 am: 1f2605f517 am: 912a832de1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599

Change-Id: I2b42c88920c59bc26e2a6531e1812fa6afe9650a
2020-07-03 11:50:34 +00:00
Pavel Grafov
912a832de1 Merge "Connectivity: start PAC global proxy after reboot." am: 22fbf24ce4 am: 1f2605f517
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599

Change-Id: I5bb6267ca876df8aef0b2df630c058726b195352
2020-07-03 11:38:59 +00:00
Pavel Grafov
1f2605f517 Merge "Connectivity: start PAC global proxy after reboot." am: 22fbf24ce4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599

Change-Id: I31aa41a6268d88178c4a3f276c7ea7750695b417
2020-07-03 11:13:01 +00:00
Pavel Grafov
22fbf24ce4 Merge "Connectivity: start PAC global proxy after reboot." 2020-07-03 10:54:10 +00:00
Treehugger Robot
88ce9f1a77 [automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: cf29497f56 -s ours am: 52220bc071 -s ours am: 5c7e8d4511 -s ours
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 is in history

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

Change-Id: I488aaec3e0edf160d30063c20090d428a0128b68
2020-07-03 02:04:29 +00:00
Treehugger Robot
5c7e8d4511 [automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: cf29497f56 -s ours am: 52220bc071 -s ours
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 is in history

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

Change-Id: I8f5a2c331176a3e1a2c11aebe65a6a8799f309a2
2020-07-03 01:53:51 +00:00
Treehugger Robot
52220bc071 [automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: cf29497f56 -s ours
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 is in history

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

Change-Id: Ie3cef51a714de2c9111554c84a5e7aba49a4818f
2020-07-03 01:36:29 +00:00
Treehugger Robot
cf29497f56 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
2020-07-03 00:54:07 +00:00
Chalard Jean
064d18d188 Revert "Move Inet[4]AddressUtils to libs/net"
This reverts commit c98e38195d.

Reason for revert: Breaks the build b/160390899

Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44
2020-07-02 23:47:35 +00:00
Remi NGUYEN VAN
49853b9e8d [automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: 53fbc9d8c0 -s ours am: 642e1237dd -s ours am: 080150ee39 -s ours
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 c3884937e1 is in history

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

Change-Id: I50f022d349da36cb90e1fa3fc250659511d42d04
2020-07-02 10:03:06 +00:00
Remi NGUYEN VAN
080150ee39 [automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: 53fbc9d8c0 -s ours am: 642e1237dd -s ours
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 c3884937e1 is in history

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

Change-Id: Iad6a186fda02f69741ef0a2403e16973300bae1e
2020-07-02 09:52:45 +00:00
Remi NGUYEN VAN
642e1237dd [automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: 53fbc9d8c0 -s ours
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 c3884937e1 is in history

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

Change-Id: Iae9c8eb2e17130737e4cd30b03c4d20afbae6dc8
2020-07-02 09:39:11 +00:00
Remi NGUYEN VAN
53fbc9d8c0 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
2020-07-02 09:21:23 +00:00
Remi NGUYEN VAN
c98e38195d 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
2020-07-02 10:52:31 +09:00
Chalard Jean
1855e4dad9 Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 8ec089e59a am: 007c9dd007 am: aa02f30a39 am: 1efb4bc616
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491

Change-Id: I3b9c83c31f275ee1ea8cbd44002b2a3bd19f8763
2020-07-01 05:58:07 +00:00
Chalard Jean
1efb4bc616 Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 8ec089e59a am: 007c9dd007 am: aa02f30a39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491

Change-Id: I5e7c7d0d6dd93d6b2203a9a8caa7acc38fae75e0
2020-07-01 05:47:13 +00:00
Chalard Jean
aa02f30a39 Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 8ec089e59a am: 007c9dd007
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491

Change-Id: Ibc8d633a6e04f7cd0f4c1a0d02ae586232cc0c6a
2020-07-01 05:33:41 +00:00
Chalard Jean
007c9dd007 Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 8ec089e59a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491

Change-Id: I837da6368ab0492c5c65afba4e6cb388d526199d
2020-07-01 05:21:03 +00:00
Chalard Jean
8ec089e59a Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" 2020-07-01 05:12:40 +00:00
Chalard Jean
f90e5bcc2a 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
2020-07-01 01:46:26 +00:00
Xiao Ma
968ed722c4 Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 111123c560 am: 22c1b251b6 am: ec4d808567 am: 1b6aeb7647
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637

Change-Id: Ib8f6ee477924804ad96dc9d8b2a24eb3d0445746
2020-06-29 12:42:09 +00:00
Paul Hu
554f1d70a6 Merge "[RFPM01] Merge package added/removed methods" am: 6287112701 am: b67261dcc9 am: de2cdb300b am: d63f062d3f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236

Change-Id: I97d47176f79203e4bd6eb08e12c203c61d93cacb
2020-06-29 12:41:12 +00:00
Xiao Ma
1b6aeb7647 Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 111123c560 am: 22c1b251b6 am: ec4d808567
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637

Change-Id: Id024f3d8fff3df18900a9dd2bae0d655901722d0
2020-06-29 12:31:30 +00:00
Paul Hu
d63f062d3f Merge "[RFPM01] Merge package added/removed methods" am: 6287112701 am: b67261dcc9 am: de2cdb300b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236

Change-Id: Ic19f6bd30a1e70b5887719d730ce08bc0539ec10
2020-06-29 12:30:59 +00:00
Xiao Ma
ec4d808567 Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 111123c560 am: 22c1b251b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637

Change-Id: Iaf964024c44e6b78ccb3b8fcf3fc131479747a81
2020-06-29 12:17:26 +00:00
Paul Hu
de2cdb300b Merge "[RFPM01] Merge package added/removed methods" am: 6287112701 am: b67261dcc9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236

Change-Id: Ida8f82d2ec5be1040a2bdf2aa65a94d53f68ea6c
2020-06-29 12:16:47 +00:00
Xiao Ma
22c1b251b6 Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 111123c560
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637

Change-Id: I2f6870d0a6b4e52e484f926d86352f6dcd393cca
2020-06-29 12:04:24 +00:00
Paul Hu
b67261dcc9 Merge "[RFPM01] Merge package added/removed methods" am: 6287112701
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236

Change-Id: I0c7f6ab65220eaf0169fb4d88f9aec023ab33228
2020-06-29 12:03:56 +00:00
Xiao Ma
111123c560 Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." 2020-06-29 11:58:24 +00:00
Xiao Ma
0c140bf1ec Test IPv6ProvisioningLossParcelable in the NetworkAttributes.
Bug: 157534516
Test: atest FrameworksNetTests
Change-Id: I8dbff2377457bb8fd0f447be0a3cda9af952f2a2
2020-06-29 11:57:32 +00:00
Paul Hu
6287112701 Merge "[RFPM01] Merge package added/removed methods" 2020-06-29 11:50:57 +00:00
Automerger Merge Worker
d8b28ebf55 Merge "[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 9e4a87ee75 -s ours" into rvc-d1-dev-plus-aosp am: 49b8297269 -s ours
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b9128f36a5 is in history

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

Change-Id: If79ab6c3a617346bc54308d8c75ece3f0616ef76
2020-06-26 15:50:08 +00:00
Lorenzo Colitti
9bdee63f9c [automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 am: 76c6bc4a0d -s ours am: f40ffce16d -s ours
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 3d1df816d2 is in history

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

Change-Id: I92e4babb140258d1f8ab2a6be57f24e7dca35c0c
2020-06-26 15:49:50 +00:00
Automerger Merge Worker
49b8297269 Merge "[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 9e4a87ee75 -s ours" into rvc-d1-dev-plus-aosp 2020-06-26 15:34:00 +00:00
Lorenzo Colitti
d23824c1e8 [automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 9e4a87ee75 -s ours
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 3d1df816d2 is in history

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

Change-Id: I0c408a703c9de759cf569b1e8cbeb749fbf906df
2020-06-26 15:33:51 +00:00
Lorenzo Colitti
f40ffce16d [automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 am: 76c6bc4a0d -s ours
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 3d1df816d2 is in history

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

Change-Id: I55264ab00ba7646dde9e6c7b9a600258b8b992e2
2020-06-26 15:33:41 +00:00
Lorenzo Colitti
76c6bc4a0d 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
2020-06-26 15:21:45 +00:00
Lorenzo Colitti
9e4a87ee75 [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 3d1df816d2 is in history

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

Change-Id: I5d9f3dfaf49f78773c92f4c6dfefb95adb629ce8
2020-06-26 15:21:24 +00:00
Lorenzo Colitti
56b6b914a2 Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586 am: 078956721a am: d92c042e59 am: d67aa703df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662

Change-Id: Ie94d976b06c7e64cf3b45eb29b22ad8cb25e3198
2020-06-26 08:19:30 +00:00
Lorenzo Colitti
d67aa703df Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586 am: 078956721a am: d92c042e59
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662

Change-Id: I8ccbf85a2e49c487424642bba5900239b3faff5f
2020-06-26 08:07:20 +00:00
Lorenzo Colitti
b9128f36a5 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
2020-06-26 07:59:04 +00:00
Lorenzo Colitti
d92c042e59 Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586 am: 078956721a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662

Change-Id: Id42979bdb98469f586d97f05ed8ecdc28fbb878f
2020-06-26 07:48:13 +00:00
Lorenzo Colitti
078956721a Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662

Change-Id: Ie3108f4cc45083523f6f0cda67dad1f13568f296
2020-06-26 07:31:08 +00:00
Lorenzo Colitti
ed2ccf0586 Merge "Send ConnDiags event before revalidating network in CS." 2020-06-26 07:13:56 +00:00
Cody Kesting
3d1df816d2 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
Change-Id: Ic7bc7138c54c47bbfdf56af5811709fde66f8606
2020-06-25 16:57:18 -07:00
Orion Hodson
d04d0f46f0 [automerger skipped] Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e am: ed859035cc -s ours am: 3993085c54 -s ours am: e3eae72916 -s ours
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 c206662f5b is in history

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

Change-Id: I3f024bdb06de2b019e136e9542c11b0067c604be
2020-06-25 08:50:30 +00:00
Orion Hodson
e3eae72916 [automerger skipped] Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e am: ed859035cc -s ours am: 3993085c54 -s ours
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 c206662f5b is in history

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

Change-Id: I4b94400277e38db25c76e02f66e4f5f523358452
2020-06-25 08:32:19 +00:00