Commit Graph

8226 Commits

Author SHA1 Message Date
Lorenzo Colitti
9f5958083f Merge "Make most of NetworkAgent @SystemApi." 2020-01-15 09:56:31 +00:00
paulhu
e102b0bb49 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
0df6dd8e99 [automerger skipped] Merge "Unhide NetworkRequest API which use legacy type" am: a64019915e am: 8dbe02fe3f am: 258cd4b9c3 -s ours
am skip reason: Change-Id I349da06769e9ffcee6bb42f51ab454e0ef774fb3 with SHA-1 fd051db78b is in history

Change-Id: I29e66b1d11cf93888265fca34cb1689472bd5cda
2020-01-15 07:29:25 +00:00
Automerger Merge Worker
258cd4b9c3 Merge "Unhide NetworkRequest API which use legacy type" am: a64019915e am: 8dbe02fe3f
Change-Id: I3a72ed77540329a355547c115b0250d00ccf5630
2020-01-15 07:15:12 +00:00
Mark Chien
8dbe02fe3f Merge "Unhide NetworkRequest API which use legacy type"
am: a64019915e

Change-Id: Ie6f4021c758aececda5628ba5f0e3b59f1aff42d
2020-01-14 23:06:28 -08:00
Lorenzo Colitti
980ed12f7f 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
a64019915e Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 06:49:33 +00:00
Automerger Merge Worker
b28c4595c5 [automerger skipped] Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 4ed1963c4a am: f0049fe598 am: d0e21c2a85 -s ours
am skip reason: Change-Id I94171b2dc4f26442df918547bf8bc40953f63f2e with SHA-1 ce12f80581 is in history

Change-Id: Iaccbabe29656681be9894076e0064a25ca894587
2020-01-15 05:33:57 +00:00
Automerger Merge Worker
d0e21c2a85 Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 4ed1963c4a am: f0049fe598
Change-Id: If67241a41678690a63a9cc20d2125fc2ee90ada6
2020-01-15 05:18:14 +00:00
paulhu
f0049fe598 Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
am: 4ed1963c4a

Change-Id: I26e3d04bb9c5c895bf8f9a20d3cc1c5caf87db1e
2020-01-14 21:08:13 -08:00
Treehugger Robot
4ed1963c4a Merge "Expose SocketKeepalive#SUCCESS as SystemApi" 2020-01-15 05:01:04 +00:00
Mark Chien
997956750f Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 04:29:15 +00:00
Remi NGUYEN VAN
44637dd69d Merge "Add NetworkRequest#satisfiedBy to SystemApi" 2020-01-15 04:14:32 +00:00
Remi NGUYEN VAN
fbd218e93c Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" 2020-01-15 04:13:59 +00:00
TreeHugger Robot
2904732e77 Merge "Remove framework code that has moved to frameworks/libs/net" 2020-01-15 02:47:52 +00:00
paulhu
2f7c345d56 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
4d68e42338 Merge "Expose SocketKeepalive#SUCCESS as SystemApi" 2020-01-15 02:44:32 +00:00
Rambo Wang
582ba554de 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
Automerger Merge Worker
80911190ca Merge "Make NattKeepalivePacketData @SystemApi" am: 9fef5a5cf0 am: 6426059fa3 am: 2be2e8d19f
Change-Id: Idd26f3118e879ab05a8cdd23a9e4999b3bafbf47
2020-01-14 15:32:07 +00:00
Automerger Merge Worker
2be2e8d19f Merge "Make NattKeepalivePacketData @SystemApi" am: 9fef5a5cf0 am: 6426059fa3
Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d
2020-01-14 15:18:43 +00:00
Aaron Huang
6426059fa3 Merge "Make NattKeepalivePacketData @SystemApi"
am: 9fef5a5cf0

Change-Id: I6d212d1b830f29b8d8a77c727bfa23572f7e08a6
2020-01-14 07:03:31 -08:00
Aaron Huang
9fef5a5cf0 Merge "Make NattKeepalivePacketData @SystemApi" 2020-01-14 14:36:09 +00:00
paulhu
ce12f80581 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
04b18a9e7b 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
93de608316 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
2429c7091c 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
1426060355 Merge "Have registerNetworkAgent return a Network." 2020-01-14 07:06:37 +00:00
Automerger Merge Worker
abf06a174d Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: baf25cde90 am: 385ec77624 am: de99f55513
Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
2020-01-14 06:27:10 +00:00
Automerger Merge Worker
de99f55513 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: baf25cde90 am: 385ec77624
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
2020-01-14 06:17:26 +00:00
Lorenzo Colitti
385ec77624 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
am: baf25cde90

Change-Id: I5b8def0055bb8f7062405b1f354c1edf6292a129
2020-01-13 22:04:13 -08:00
Lorenzo Colitti
baf25cde90 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" 2020-01-14 05:30:14 +00:00
Lorenzo Colitti
640fa9a6ac Merge "Add a Builder to NetworkAgentConfig, and make it SystemApi." 2020-01-14 05:01:06 +00:00
Chalard Jean
b0a42f7284 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
d6eeffd079 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
fd051db78b 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
5b2e000f6d 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
5e6e597748 Merge "Support reevaluation request from captive portal app" am: 254c3d830e am: 006e9bc1e7 am: 5980ff839e
Change-Id: Id0c020ade4c7de71f7540a82d84045e131ea25e2
2020-01-14 02:33:53 +00:00
Automerger Merge Worker
5980ff839e Merge "Support reevaluation request from captive portal app" am: 254c3d830e am: 006e9bc1e7
Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2
2020-01-14 02:17:06 +00:00
Chiachang Wang
006e9bc1e7 Merge "Support reevaluation request from captive portal app"
am: 254c3d830e

Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363
2020-01-13 18:05:03 -08:00
paulhu
74357e70a8 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
254c3d830e Merge "Support reevaluation request from captive portal app" 2020-01-14 01:42:22 +00:00
Aaron Huang
aead9c64fa Make NattKeepalivePacketData @SystemApi
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests

Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Automerger Merge Worker
4a652ef131 Merge changes from topic "sp04" am: 429d86ae3c am: 3402bbf714 am: 75f84db7f5
Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4
2020-01-13 14:48:20 +00:00
Automerger Merge Worker
d34181656c [SP04] add unit test for NetworkStatsProvider am: 276921b6e1 am: 85f2dd96fc am: 7d46ce14c9
Change-Id: Ic48609b113a7174204eaa2207901c8110d76f65f
2020-01-13 14:48:10 +00:00
Automerger Merge Worker
75f84db7f5 Merge changes from topic "sp04" am: 429d86ae3c am: 3402bbf714
Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d
2020-01-13 14:28:14 +00:00
Automerger Merge Worker
7d46ce14c9 [SP04] add unit test for NetworkStatsProvider am: 276921b6e1 am: 85f2dd96fc
Change-Id: I0ce508b3ccf22b01603de7246b2068d3b1a2afcd
2020-01-13 14:28:10 +00:00
Junyu Lai
3402bbf714 Merge changes from topic "sp04"
am: 429d86ae3c

Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
2020-01-13 06:12:54 -08:00
junyulai
85f2dd96fc [SP04] add unit test for NetworkStatsProvider
am: 276921b6e1

Change-Id: Icd440ff9086604cb0baaa4cb3e8e458dcda3bb97
2020-01-13 06:12:48 -08:00
Junyu Lai
429d86ae3c 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
276921b6e1 [SP04] add unit test for NetworkStatsProvider
Test: atest NetworkStatsServiceTest
Bug: 130855321
Change-Id: I0c19d8bedcb9398da3f464efe01e775fde9f8a78
2020-01-13 14:43:06 +08:00