Aaron Huang
8f98e732a0
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
2020-07-17 06:05:38 +00:00
Aaron Huang
5463bbece5
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: Ib3e7b1ff5c2fbe3fd9a049b58faf26a6c355ad8f
2020-07-17 05:53:43 +00:00
Aaron Huang
c36f17d32e
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)"
2020-07-17 05:40:31 +00:00
junyulai
fbb36e7d8e
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c3e3a1d0ef is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I7e48e1b94107d84a1b828b005437ad2e24a92850
2020-07-17 04:03:35 +00:00
Treehugger Robot
dc4c9d51a1
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673 am: 0c55907a0a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: Idef0dd6e0e0486b76c0067540e580d444e97d6a0
2020-07-16 12:09:04 +00:00
Treehugger Robot
0c55907a0a
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: I74242ad8ffae7aa7bcf0562eee577d7f66747f09
2020-07-16 11:57:03 +00:00
Treehugger Robot
0ac564e673
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode"
2020-07-16 11:43:51 +00:00
junyulai
c3e3a1d0ef
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
2020-07-16 18:22:09 +08:00
junyulai
2774832382
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
2020-07-16 15:33:35 +08:00
Treehugger Robot
a3d509537c
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: ce769a0d8e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: If052329128326fba72ff27c024a2c6652b7bb1ef
2020-07-10 05:41:05 +00:00
Treehugger Robot
ce769a0d8e
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I0b5da0e4e20cbd2dd5856b04d1f1ddfe3323b10b
2020-07-10 05:26:41 +00:00
Chalard Jean
9816816837
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ded38fda42 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: Ie9e902ce58b8c6641967c8c6a4fa74cefcf49ab1
2020-07-10 05:00:57 +00:00
Junyu Lai
43b3142dc3
Revert "Attribute data usage to 5G for 5G non-standalone mode"
...
This reverts commit dc31686c31 .
Reason for revert: Revert and wait for the design is settled down.
Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810
2020-07-10 03:43:19 +00:00
Junyu Lai
7249a46c8e
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: 214280263e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I860b0226157ee31f0488d6b2252ae157e86dc5eb
2020-07-10 03:10:15 +00:00
Junyu Lai
214280263e
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I89ed9dd80f6b30e43e59d91fdd3fb91fb0e9be45
2020-07-10 02:56:44 +00:00
junyulai
dc31686c31
Attribute data usage to 5G for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I563df14500caeb3602b381479afaf5163ad8e6a1
2020-07-09 16:56:54 +08:00
Paul Hu
99670e6e0c
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934 am: 9778855eb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: If53e1521327c8d9f1fd2a5debb94c58ed25b2880
2020-07-08 10:35:21 +00:00
Paul Hu
9778855eb6
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: Ibc81b90c9a7428f63afcb6bad27eb593cf2f628e
2020-07-08 10:24:36 +00:00
Paul Hu
27cba24934
Merge "[RFPM02] Add Dependencies class for injection in tests."
2020-07-08 10:07:23 +00:00
Chalard Jean
9aa3127449
Add some more public doc for MacAddress
...
Bug: 140807677
Test: doc-only change
Original-Change: https://android-review.googlesource.com/1354447
Merged-In: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
Change-Id: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
2020-07-08 09:38:37 +00:00
paulhu
a1a8814b82
[RFPM02] Add Dependencies class for injection in tests.
...
Add Dependencies class in PermissionMonitor for injection
in tests easily.
Bug: 132784544
Test: atests FrameworksNetTests
Change-Id: Ibb84d548908f7a955fa0ff206794486733259978
2020-07-08 15:30:42 +08:00
Chalard Jean
074d5a8e8a
Merge "Add some more public doc for MacAddress" am: a9c0a7e2e2 am: 3b3c6ffdc2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I5c9061fa832c75c9e0476c54bacec3deb114a96d
2020-07-08 05:38:59 +00:00
Chalard Jean
3b3c6ffdc2
Merge "Add some more public doc for MacAddress" am: a9c0a7e2e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I1126b78eb886c5c84afa107b028fe2569d7573e4
2020-07-08 05:29:56 +00:00
Chalard Jean
a9c0a7e2e2
Merge "Add some more public doc for MacAddress"
2020-07-08 05:15:20 +00:00
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
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
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
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
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
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
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
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