Commit Graph

8494 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
59917caa0e 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
Merged-In: I1d4a928256951397cabde5c352a872fd48d85859
Change-Id: I1d4a928256951397cabde5c352a872fd48d85859
(clean cherry-pick from internal branch)
2020-01-21 12:11:52 +09:00
Remi NGUYEN VAN
82b5bb6d4f 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
Merged-In: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
Change-Id: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
(clean cherry-pick from internal branch)
2020-01-21 12:10:34 +09:00
Automerger Merge Worker
5fd790f968 Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 59b776a9e5
Change-Id: I6460295b5c7c045a3d60f5c281295f3a0cf83110
2020-01-21 02:21:35 +00:00
Chiachang Wang
59b776a9e5 Merge "Have registerNetworkAgent return a Network."
am: 061d68a40c

Change-Id: I49684d1079d618414149199d2cfe128bd71f7b16
2020-01-20 18:06:33 -08:00
Cody Kesting
3d97b5e635 Make DataStallReport Parcelable.
DataStallReport is defined inside ConnectivityDiagnosticsManager. In
order for DataStallReport to be used in aidls, it must implement the
Parcelable interface.

Bug: 143187964
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Idbb4885e2f67fb3f85d406a622ae45d34492dca4
2020-01-20 18:02:09 -08:00
Cody Kesting
beb41b5457 Make ConnectivityReport Parcelable.
ConnectivityReport is defined inside ConnectivityDiagnosticsManager. In
order for ConnectivityReport to be used in aidl interfaces, it must
implement the Parcelable interface.

Bug: 143187964
Test: compiles
Test: atest FrameworksNetTests
Change-Id: I8e862c78bd84b5da14203f61ce44beb1ca4a623d
2020-01-20 18:02:09 -08:00
Chalard Jean
af14ca4fd1 Make NetworkCapabilities authoritative for roaming state
...instead of NetworkInfo

Bug: 138306002
Test: FrameworksNetTests FrameworksTelephonyTests
Change-Id: Ifdea19fa32089b5c7925f5010169b1dea3d2b304
Merged-In: Ifdea19fa32089b5c7925f5010169b1dea3d2b304
2020-01-20 10:45:48 +00:00
Chalard Jean
d61375df7c Make NetworkCapabilities authoritative for suspended state
...instead of NetworkInfo

Bug: 138306002
Test: FrameworksNetTests FrameworksTelephonyTests
Change-Id: I4808fcc0047a926b23ed3d49d979bb7b0371dc69
Merged-In: I4808fcc0047a926b23ed3d49d979bb7b0371dc69
2020-01-20 10:37:29 +00:00
Chalard Jean
f78c964538 Have registerNetworkAgent return a Network.
This is more useful.

Bug: 135998869
Test: FrameworkNetTests FrameworksWifiTests
Change-Id: I74710b396fa3cec6fbae08d3dcab5bc90dc2e669
Merged-In: I74710b396fa3cec6fbae08d3dcab5bc90dc2e669
2020-01-20 16:22:06 +08:00
Remi NGUYEN VAN
a1c2a738e8 Add tests to services/tests/net test mapping
FrameworksNetIntegrationTests goes from postsubmit to presubmit (it has
been green since it was checked in).
FrameworksNetDeflakeTest goes to postsubmit and will go to presubmit if
it proves to be non-flaky.

Test: results on test dashboard for FrameworksNetIntegrationTests
      this CL is necessary to get test results for the deflake test

Change-Id: I9722a082bae32e231e60f53dac5fea4b49028865
2020-01-17 11:38:29 +09:00
Automerger Merge Worker
bb0d2a0466 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: c926be1028
Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
2020-01-16 18:34:50 +00:00
Xin Li
c926be1028 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
Automerger Merge Worker
0fee898931 Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: b2ff467a3a am: b5d058e25d
Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812
2020-01-15 18:24:31 +00:00
Rambo Wang
b5d058e25d Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
am: b2ff467a3a

Change-Id: Ifc07007c5bdf74199c7618fa089745eab99f95be
2020-01-15 10:08:51 -08:00
Rambo Wang
b2ff467a3a Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" 2020-01-15 17:45:58 +00:00
Automerger Merge Worker
c80e25552e Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: 7916449753 am: 494d63249a
Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
2020-01-15 12:16:25 +00:00
paulhu
494d63249a Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"
am: 7916449753

Change-Id: I27cb6214bf5a42c9120dd871228b224cd41e1199
2020-01-15 04:03:29 -08:00
Treehugger Robot
7916449753 Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" 2020-01-15 11:42:11 +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
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
Mark Chien
a64019915e Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 06:49:33 +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
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
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
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
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
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
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
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
Chiachang Wang
938bfba0c3 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
Automerger Merge Worker
243e5f21ea Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: 3efc93af3d
Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0
2020-01-13 04:34:10 +00:00
Lorenzo Colitti
3efc93af3d Merge changes I7ea39b80,I6b9979f3
am: 310d1dac0d

Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
2020-01-12 20:19:21 -08:00
Lorenzo Colitti
a86fae785a 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
02ee974ee1 Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 0e82d1c50d am: 2d976e6c9e
Change-Id: I3b07f1715e550568014becb9f987963777da4bba
2020-01-10 09:43:41 +00:00