Commit Graph

4814 Commits

Author SHA1 Message Date
Aaron Huang
9e0c5262ca Merge "Move DnsSdTxtRecord to net common static library" 2020-01-16 03:15:55 +00:00
Automerger Merge Worker
de38d0529f Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: 7fd95f64df am: 4a76965c68 am: b8a357c250
Change-Id: I9aee20185e189e51d537b6b0895fdc31c31d0ea2
2020-01-15 18:39:33 +00:00
Automerger Merge Worker
b8a357c250 Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: 7fd95f64df am: 4a76965c68
Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812
2020-01-15 18:24:31 +00:00
Rambo Wang
7fd95f64df Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" 2020-01-15 17:45:58 +00:00
TreeHugger Robot
0fb4b69edb Merge "NetworkAgent: Fix doc build fail by invalid tag" 2020-01-15 14:59:04 +00:00
markchien
06b9dfbaa0 NetworkAgent: Fix doc build fail by invalid tag
Bug: 138306002
Bug: 139268426
Test: make doc-comment-check-docs

Change-Id: I8b8df5096b90ad10545087ab09f68ecae637aa35
2020-01-15 12:58:25 +00:00
Automerger Merge Worker
55bc2a3b5e Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e am: 968f5a9665
Change-Id: Iece2ad4133751a8c258f64d7796158ffe90881ce
2020-01-15 12:33:59 +00:00
Automerger Merge Worker
968f5a9665 Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e
Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
2020-01-15 12:16:25 +00:00
Treehugger Robot
dda5e92547 Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" 2020-01-15 11:42:11 +00:00
Lorenzo Colitti
b4f3288e38 Merge "Make most of NetworkAgent @SystemApi." 2020-01-15 09:56:31 +00:00
paulhu
5ae1d2c043 Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests

Change-Id: I77cb45e6b2aaf4ab2c457cb59ccf77b1b8c01fa9
2020-01-15 15:38:23 +08:00
Automerger Merge Worker
4c0487a163 Merge "Allow opening tethering when data saver ON" am: bd7fa99584 am: 80cc1ede37 am: dbefc5e6ac
Change-Id: I24a842de6918ccd0eb1dc60161854ea25528dff5
2020-01-15 07:29:40 +00:00
Automerger Merge Worker
dbefc5e6ac Merge "Allow opening tethering when data saver ON" am: bd7fa99584 am: 80cc1ede37
Change-Id: If569a0471eb59c244965c01b02aae71b49dc05a8
2020-01-15 07:15:19 +00:00
Automerger Merge Worker
6518424d07 Merge "Unhide NetworkRequest API which use legacy type" am: cd2ffc26dc am: d8d358dc63
Change-Id: I3a72ed77540329a355547c115b0250d00ccf5630
2020-01-15 07:15:12 +00:00
Lorenzo Colitti
631f33a68f 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
bd7fa99584 Merge "Allow opening tethering when data saver ON" 2020-01-15 06:58:29 +00:00
Mark Chien
cd2ffc26dc Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 06:49:33 +00:00
Automerger Merge Worker
f39d8f016f Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 4c85840bd0 am: 5ccdd4fc53
Change-Id: If67241a41678690a63a9cc20d2125fc2ee90ada6
2020-01-15 05:18:14 +00:00
Treehugger Robot
4c85840bd0 Merge "Expose SocketKeepalive#SUCCESS as SystemApi" 2020-01-15 05:01:04 +00:00
Mark Chien
9eb533470d Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 04:29:15 +00:00
Remi NGUYEN VAN
b7c80b5557 Merge "Add NetworkRequest#satisfiedBy to SystemApi" 2020-01-15 04:14:32 +00:00
Remi NGUYEN VAN
b9fd752f64 Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" 2020-01-15 04:13:59 +00:00
TreeHugger Robot
a682ec6e7d Merge "Remove framework code that has moved to frameworks/libs/net" 2020-01-15 02:47:52 +00:00
paulhu
521cd8c85d 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
cb8f129c89 Merge "Expose SocketKeepalive#SUCCESS as SystemApi" 2020-01-15 02:44:32 +00:00
David Su
872387eeb4 Update JavaDoc for CACHE_FILTER_NONE
Renamed to SCORE_FILTER_NONE.

Bug: 135998869
Test: compiles
Change-Id: I4c3e3583aae6f79dcaa68a1a8d2f167f43911b2f
2020-01-14 14:03:08 -08:00
Rambo Wang
818cf71da8 Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer
StringNetworkSpecifier is widely used to specify subscription id for
the NetworkRequest. The raw string field introduce ambiguity and leave
large space for bugs. With TelephonyNetworkSpecifer, we are able to
settle down the type and value of the fields (although currently only
one) and introduce validation to detect the bug in the beginning.

Bug: 145993724
Test: atest FrameworksNetTests FrameworksTelephonyTests &
      make offline-sdk-docs
Change-Id: Iefbad9b1deb3de2c0b262d9ce5ae0704a50d08a6
2020-01-14 10:51:11 -08:00
David Su
684c9a2e63 Merge changes from topic "networkscoremanager-cachefilter"
* changes:
  SettingsLib: Rename CACHE_FILTER_* to SCORE_FILTER_*
  NetworkScoreManager: Expose SCORE_FILTER_* consts
2020-01-14 18:20:41 +00:00
Automerger Merge Worker
331edc9a1b Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59 am: b256f4d348
Change-Id: Idd26f3118e879ab05a8cdd23a9e4999b3bafbf47
2020-01-14 15:32:07 +00:00
Automerger Merge Worker
b256f4d348 Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59
Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d
2020-01-14 15:18:43 +00:00
Aaron Huang
3516f5853a Merge "Make NattKeepalivePacketData @SystemApi" 2020-01-14 14:36:09 +00:00
paulhu
bd47e8cde8 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
f863b80c70 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
d0658b639d 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
markchien
3fe660bc4a Allow opening tethering when data saver ON
When data saver enabled, tethering would be OFF.
Currently settings would not allow user to turning tethering back.
After aosp/1181583 is merged, user can turn tethering back without
turning data saver OFF.

Bug: 145711175
Bug: 142374233
Test: atest TetheringTests
      OFF/ON tethering when data saver ON

Change-Id: I59e662ba771a563f5f1766ba29e05246b8280220
2020-01-14 20:15:31 +08:00
Aaron Huang
3587754f22 Move DnsSdTxtRecord to net common static library
DnsSdTxtRecord is moved to frameworks/libs/net for mainline
support. Also change the import path using this class.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I6118b313ce668707d598aa2eab9baee2f7622dbc
2020-01-14 17:50:11 +08:00
Aaron Huang
94df39acd8 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
f41a9d0051 Merge "Have registerNetworkAgent return a Network." 2020-01-14 07:06:37 +00:00
Automerger Merge Worker
ee209e1194 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 03c1364b16 am: 28220533d8 am: 8669be6a1b
Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
2020-01-14 06:27:10 +00:00
Automerger Merge Worker
8669be6a1b Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 03c1364b16 am: 28220533d8
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
2020-01-14 06:17:26 +00:00
Lorenzo Colitti
03c1364b16 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" 2020-01-14 05:30:14 +00:00
Lorenzo Colitti
cae0b367e0 Merge "Add a Builder to NetworkAgentConfig, and make it SystemApi." 2020-01-14 05:01:06 +00:00
Chalard Jean
a0e2aa127a 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
6fa7a30e51 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
ace1d3446f 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
7638966e93 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
69f81d1f12 Merge "Support reevaluation request from captive portal app" am: ba43c13e77 am: 92718acb09 am: 5c9fe3df4a
Change-Id: Id0c020ade4c7de71f7540a82d84045e131ea25e2
2020-01-14 02:33:53 +00:00
Automerger Merge Worker
5c9fe3df4a Merge "Support reevaluation request from captive portal app" am: ba43c13e77 am: 92718acb09
Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2
2020-01-14 02:17:06 +00:00
paulhu
4dc238b5e5 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
ba43c13e77 Merge "Support reevaluation request from captive portal app" 2020-01-14 01:42:22 +00:00