Commit Graph

8112 Commits

Author SHA1 Message Date
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
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
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
Lorenzo Colitti
df43b6f77a Make NetworkAgent stop subclassing Handler.
Subclassing Handler is not appropriate for a system API because
it is an implementation detail and allows users of this class to
post messages to the handler in ways that allow inappropriate
access to internals that aren't part of the API contract.

Also fix some lint errors.

Test: builds
Bug: 138306002
Change-Id: I79478ceff6bbcae879d1025098d177de0d15dbee
2020-01-13 14:49:15 +09:00
Automerger Merge Worker
8887e6d98c Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: b65004fb39 am: 86daa3d123
Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e
2020-01-13 04:51:33 +00:00
Automerger Merge Worker
86daa3d123 Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: b65004fb39
Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0
2020-01-13 04:34:10 +00:00
Lorenzo Colitti
b65004fb39 Merge changes I7ea39b80,I6b9979f3
am: 310d1dac0d

Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
2020-01-12 20:19:21 -08:00
Lorenzo Colitti
94c9314065 Stop using NetworkFactory in connectivity code.
Bug: 138306002
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I6b9979f343108c0c077abd86ae1c21e5ece0cccc
2020-01-12 17:40:02 +09:00
Automerger Merge Worker
4e75cd9d7a Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 39ac72436e am: 21da34591b am: 8668775892
Change-Id: I9d593d245287362aad82d70ac5fed4d6339f82d7
2020-01-10 09:55:33 +00:00
Automerger Merge Worker
8668775892 Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 39ac72436e am: 21da34591b
Change-Id: I3b07f1715e550568014becb9f987963777da4bba
2020-01-10 09:43:41 +00:00
paulhu
21da34591b Merge "Add NetworkCapabilities#deduceRestrictedCapability"
am: 39ac72436e

Change-Id: I3c451ed7725cacd5672e7b1920a0725239015e68
2020-01-10 01:32:25 -08:00
Treehugger Robot
39ac72436e Merge "Add NetworkCapabilities#deduceRestrictedCapability" 2020-01-10 09:27:31 +00:00
Automerger Merge Worker
88c136c666 Merge "Expose DhcpInfo parcelable interface implementation methods" am: 6510da5883 am: 1debddec2f am: ead3701de3
Change-Id: I202ba0c2fe026186c59bb0d7b58d8bb8b5be98c2
2020-01-10 08:42:17 +00:00
Automerger Merge Worker
ead3701de3 Merge "Expose DhcpInfo parcelable interface implementation methods" am: 6510da5883 am: 1debddec2f
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
2020-01-10 08:34:19 +00:00
Aaron Huang
1debddec2f Merge "Expose DhcpInfo parcelable interface implementation methods"
am: 6510da5883

Change-Id: Ie432bee8641bd0c2e94adb04329ea6e80e8ed72c
2020-01-10 00:10:03 -08:00