Lorenzo Colitti
b668629e20
Merge "Make most of NetworkAgent @SystemApi."
2020-01-15 09:56:31 +00:00
Automerger Merge Worker
b054ca3720
[automerger skipped] Merge "Unhide NetworkRequest API which use legacy type" am: ac9ebd4d14 am: b6551c0c1f am: b08d9a6409 -s ours
...
am skip reason: Change-Id I349da06769e9ffcee6bb42f51ab454e0ef774fb3 with SHA-1 769c575b67 is in history
Change-Id: I29e66b1d11cf93888265fca34cb1689472bd5cda
2020-01-15 07:29:25 +00:00
Automerger Merge Worker
b08d9a6409
Merge "Unhide NetworkRequest API which use legacy type" am: ac9ebd4d14 am: b6551c0c1f
...
Change-Id: I3a72ed77540329a355547c115b0250d00ccf5630
2020-01-15 07:15:12 +00:00
Mark Chien
b6551c0c1f
Merge "Unhide NetworkRequest API which use legacy type"
...
am: ac9ebd4d14
Change-Id: Ie6f4021c758aececda5628ba5f0e3b59f1aff42d
2020-01-14 23:06:28 -08:00
Lorenzo Colitti
10a12966c2
Make most of NetworkAgent @SystemApi.
...
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: I856f01f02c35c2f6a886d8b98039e5dfbc48148b
2020-01-15 16:05:26 +09:00
Mark Chien
ac9ebd4d14
Merge "Unhide NetworkRequest API which use legacy type"
2020-01-15 06:49:33 +00:00
Automerger Merge Worker
5ed2a03acf
[automerger skipped] Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 7e7cd3b0d4 am: 43d6fdf6f8 am: f2f989d08a -s ours
...
am skip reason: Change-Id I94171b2dc4f26442df918547bf8bc40953f63f2e with SHA-1 15602153ee is in history
Change-Id: Iaccbabe29656681be9894076e0064a25ca894587
2020-01-15 05:33:57 +00:00
Automerger Merge Worker
f2f989d08a
Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 7e7cd3b0d4 am: 43d6fdf6f8
...
Change-Id: If67241a41678690a63a9cc20d2125fc2ee90ada6
2020-01-15 05:18:14 +00:00
paulhu
43d6fdf6f8
Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
...
am: 7e7cd3b0d4
Change-Id: I26e3d04bb9c5c895bf8f9a20d3cc1c5caf87db1e
2020-01-14 21:08:13 -08:00
Treehugger Robot
7e7cd3b0d4
Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
2020-01-15 05:01:04 +00:00
Mark Chien
d402e3d1f4
Merge "Unhide NetworkRequest API which use legacy type"
2020-01-15 04:29:15 +00:00
Remi NGUYEN VAN
9c5c26aa45
Merge "Add NetworkRequest#satisfiedBy to SystemApi"
2020-01-15 04:14:32 +00:00
Remi NGUYEN VAN
62f46aa07c
Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"
2020-01-15 04:13:59 +00:00
TreeHugger Robot
26246e41de
Merge "Remove framework code that has moved to frameworks/libs/net"
2020-01-15 02:47:52 +00:00
paulhu
311b769fac
Expose SocketKeepalive#SUCCESS as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
Merged-In: I94171b2dc4f26442df918547bf8bc40953f63f2e
2020-01-15 02:45:43 +00:00
Paul Hu
008e319fe4
Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
2020-01-15 02:44:32 +00:00
Automerger Merge Worker
2011b0b67f
Merge "Make NattKeepalivePacketData @SystemApi" am: d21ba54347 am: 1f5333e4e7 am: 4f463b6b2f
...
Change-Id: Idd26f3118e879ab05a8cdd23a9e4999b3bafbf47
2020-01-14 15:32:07 +00:00
Automerger Merge Worker
4f463b6b2f
Merge "Make NattKeepalivePacketData @SystemApi" am: d21ba54347 am: 1f5333e4e7
...
Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d
2020-01-14 15:18:43 +00:00
Aaron Huang
1f5333e4e7
Merge "Make NattKeepalivePacketData @SystemApi"
...
am: d21ba54347
Change-Id: I6d212d1b830f29b8d8a77c727bfa23572f7e08a6
2020-01-14 07:03:31 -08:00
Aaron Huang
d21ba54347
Merge "Make NattKeepalivePacketData @SystemApi"
2020-01-14 14:36:09 +00:00
paulhu
15602153ee
Expose SocketKeepalive#SUCCESS as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
2020-01-14 21:42:56 +08:00
Remi NGUYEN VAN
ecd878b94f
Add NetworkRequest#satisfiedBy to SystemApi
...
The API is useful for NetworkFactories to select requests based on
capabilities.
This mirrors NetworkCapabilities#satisfiedByNetworkCapabilities
Test: m
Bug: 138306002
Change-Id: I1d4a928256951397cabde5c352a872fd48d85859
2020-01-14 21:45:38 +09:00
Remi NGUYEN VAN
a771df7726
Remove handling of EVENT_UNFULFILLABLE_REQUEST
...
This message is not being sent by any component anymore.
Test: built, flashed, WiFi and telephony working
Test: atest FrameworksNetTests
Bug: 138306002
Change-Id: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
2020-01-14 21:45:30 +09:00
Aaron Huang
e654f5000d
Remove framework code that has moved to frameworks/libs/net
...
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.
Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
atest FrameworksTelephonyTests
atest ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef
2020-01-14 18:10:39 +09:00
Chalard Jean
cbb58f167b
Merge "Have registerNetworkAgent return a Network."
2020-01-14 07:06:37 +00:00
Automerger Merge Worker
3b775e8a78
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9 am: cc47efa6f0
...
Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
2020-01-14 06:27:10 +00:00
Automerger Merge Worker
cc47efa6f0
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9
...
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
2020-01-14 06:17:26 +00:00
Lorenzo Colitti
837d7c87a9
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
...
am: 0699745a3d
Change-Id: I5b8def0055bb8f7062405b1f354c1edf6292a129
2020-01-13 22:04:13 -08:00
Lorenzo Colitti
0699745a3d
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
2020-01-14 05:30:14 +00:00
Lorenzo Colitti
8229e6fee6
Merge "Add a Builder to NetworkAgentConfig, and make it SystemApi."
2020-01-14 05:01:06 +00:00
Chalard Jean
1aea87a9c1
Have registerNetworkAgent return a Network.
...
This is more useful.
Bug: 135998869
Test: FrameworkNetTests FrameworksWifiTests
Change-Id: I74710b396fa3cec6fbae08d3dcab5bc90dc2e669
2020-01-14 13:59:55 +09:00
markchien
ddd5937043
Unhide NetworkRequest API which use legacy type
...
Bug: 144753389
Test: -build, flash, boot
-atest TetheringTests
Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
Merged-In: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 04:56:54 +00:00
markchien
769c575b67
Unhide NetworkRequest API which use legacy type
...
Bug: 144753389
Test: -build, flash, boot
-atest TetheringTests
Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 12:54:40 +08:00
Lorenzo Colitti
810e98607b
Add a Builder to NetworkAgentConfig, and make it SystemApi.
...
Currently, only support the three elements in the config that are
known to be used.
Bug: 138306002
Test: builds, boots
Test: atest FrameworksTelephonyTests
Change-Id: I1d231ec2ddcff97c039bcbc815a39c1d3e26c410
2020-01-14 11:43:53 +09:00
Automerger Merge Worker
dc174e63f3
Merge "Support reevaluation request from captive portal app" am: 2d9623d86f am: 8f50df2e87 am: 53aa51e02f
...
Change-Id: Id0c020ade4c7de71f7540a82d84045e131ea25e2
2020-01-14 02:33:53 +00:00
Automerger Merge Worker
53aa51e02f
Merge "Support reevaluation request from captive portal app" am: 2d9623d86f am: 8f50df2e87
...
Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2
2020-01-14 02:17:06 +00:00
Chiachang Wang
8f50df2e87
Merge "Support reevaluation request from captive portal app"
...
am: 2d9623d86f
Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363
2020-01-13 18:05:03 -08:00
paulhu
62af612113
Expose ConnectivityManager#TYPE_NONE as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: Ia496aaeaf74fa44764640fd2b97c417509e040aa
2020-01-14 10:02:30 +08:00
Chiachang Wang
2d9623d86f
Merge "Support reevaluation request from captive portal app"
2020-01-14 01:42:22 +00:00
Aaron Huang
5dcbfa87e1
Make NattKeepalivePacketData @SystemApi
...
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Automerger Merge Worker
88249e76a5
Merge changes from topic "sp04" am: 91c7daa454 am: c91e66f3d1 am: 2c8e42ae01
...
Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4
2020-01-13 14:48:20 +00:00
Automerger Merge Worker
91286e2c63
[SP04] add unit test for NetworkStatsProvider am: d6de56f3fb am: ca0bbc3437 am: bde18f1ff1
...
Change-Id: Ic48609b113a7174204eaa2207901c8110d76f65f
2020-01-13 14:48:10 +00:00
Automerger Merge Worker
2c8e42ae01
Merge changes from topic "sp04" am: 91c7daa454 am: c91e66f3d1
...
Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d
2020-01-13 14:28:14 +00:00
Automerger Merge Worker
bde18f1ff1
[SP04] add unit test for NetworkStatsProvider am: d6de56f3fb am: ca0bbc3437
...
Change-Id: I0ce508b3ccf22b01603de7246b2068d3b1a2afcd
2020-01-13 14:28:10 +00:00
Junyu Lai
c91e66f3d1
Merge changes from topic "sp04"
...
am: 91c7daa454
Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
2020-01-13 06:12:54 -08:00
junyulai
ca0bbc3437
[SP04] add unit test for NetworkStatsProvider
...
am: d6de56f3fb
Change-Id: Icd440ff9086604cb0baaa4cb3e8e458dcda3bb97
2020-01-13 06:12:48 -08:00
Junyu Lai
91c7daa454
Merge changes from topic "sp04"
...
* changes:
[SP05] add unit test for onStatsProviderLimitReached in NPMS
[SP04] add unit test for NetworkStatsProvider
[SP03] support registerNetworkStatsProvider API
[SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
2020-01-13 14:09:52 +00:00
junyulai
d6de56f3fb
[SP04] add unit test for NetworkStatsProvider
...
Test: atest NetworkStatsServiceTest
Bug: 130855321
Change-Id: I0c19d8bedcb9398da3f464efe01e775fde9f8a78
2020-01-13 14:43:06 +08:00
Chiachang Wang
ef4a17d140
Support reevaluation request from captive portal app
...
CaptivePortalLogin use similar way to validate the network as
NetworkMonitor. Provide API to reuse NetworkMonitor facilities
for consistent captive portal detection.
Bug: 134892996
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Test: manually test with captive portal Wi-Fi
Test: make system-api-stubs-docs-update-current-api \
test-api-stubs-docs-update-current-api
Change-Id: I6f039eae7ceb18eb6c3cf15587cdc27a7fe35b00
2020-01-13 14:28:02 +08:00
Lorenzo Colitti
2e966fe619
Rename NetworkMisc to NetworkAgentConfig.
...
NetworkMisc is not really an appropriate name for a system API.
Bug: 138306002
Test: builds, boots, wifi works, telephony works
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-01-13 15:01:52 +09:00