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
android-build-team Robot
0ff2373c7c
Make change and version bump to r_aml_300802900 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Iff018565791817468a1103fbaee0ba638b89fb65
2020-06-27 03:31:45 +00:00
android-build-team Robot
4b22c71402
Snap for 6634012 from b56a22487f9b492a70e5c8d79962cedb6f145568 to rvc-release
...
Change-Id: Ia8c9a3cfa1bd1024e0ef544db743edaa97ae30b8
2020-06-27 01:08:13 +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
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
3993085c54
[automerger skipped] Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e am: ed859035cc -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: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9
2020-06-25 08:13:32 +00:00
Orion Hodson
ed859035cc
Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
2020-06-25 07:58:17 +00:00
Orion Hodson
9ee9dcf07e
Merge changes from topic "lnh-platform-split"
...
* changes:
Update to use nativehelper/JNIPlatformHelp.h
Sync with libnativehelper refactoring
2020-06-25 07:36:05 +00:00
Orion Hodson
05ad56744a
Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp
2020-06-24 21:02:39 +00:00
Luke Huang
e707bbc8f2
[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 9f5ade331a am: f1d39bbada -s ours
...
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 5a42a4132f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586
Change-Id: Ib9649cba9bd46a0dc9de42dc89775cc19fff8e57
2020-06-24 19:11:48 +00:00
Luke Huang
d49b94564e
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 353e8ef81c -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 51221efa45 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa
2020-06-24 19:11:24 +00:00
Luke Huang
f1d39bbada
Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 9f5ade331a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586
Change-Id: I12eb986a95894e41679673830adbbb727d8a8834
2020-06-24 18:52:53 +00:00
Luke Huang
353e8ef81c
Merge "Move DnsPacket to libs net" am: d295f3e4f4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I9a5f1d701e5c8f7629df1dfcd0dab44e28945dfc
2020-06-24 18:51:42 +00:00
Luke Huang
9f5ade331a
Merge "Disable sockets and DNS if process lacks INTERNET permission."
2020-06-24 18:42:08 +00:00