Commit Graph

8482 Commits

Author SHA1 Message Date
Chiachang Wang
30a0107d13 Add NattKeepalivePacketDataTest
Add test for constructor and parcel

Test: atest CtsNetTestCasesLatestSdk:android.net.NattKeepalivePacketDataTest
      on both Q and R devices
Bug: 151402211
Change-Id: I97015365604be1846e3ecbaf60ac99e334705565
Merged-In: I97015365604be1846e3ecbaf60ac99e334705565
2020-03-18 05:44:26 +00:00
Chiachang Wang
62de8657e2 Add KeepalivePacketDataTest
Add test for constructor of KeepalivePacketData and
InvalidPacketException

Bug: 151109466
Test: atest CtsNetTestCasesLatestSdk:android.net.KeepalivePacketDataTest
      on both Q and R devices
Change-Id: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8
Merged-In: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8
2020-03-18 05:43:42 +00:00
Benedict Wong
0928459c2a Merge "Implement Ikev2VpnRunner" 2020-02-13 18:36:49 +00:00
Automerger Merge Worker
23f68f81e0 Merge "Add Intdef annotation for eventId in logEvent" am: 91b05f7f58 am: fc7a1308cd am: 82ec7bcf4e
Change-Id: I7caa207fb35e8088e50de0651a72a6d9628e7ce2
2020-02-13 11:24:43 +00:00
Automerger Merge Worker
82ec7bcf4e Merge "Add Intdef annotation for eventId in logEvent" am: 91b05f7f58 am: fc7a1308cd
Change-Id: I347743db825730d5c1d3b0e56b7527ce9cb3df02
2020-02-13 11:10:15 +00:00
Automerger Merge Worker
fc7a1308cd Merge "Add Intdef annotation for eventId in logEvent" am: 91b05f7f58
Change-Id: Ic9b5ea605164340d5c2461eb7a1a752bb5b36bad
2020-02-13 10:56:35 +00:00
Chiachang Wang
91b05f7f58 Merge "Add Intdef annotation for eventId in logEvent" 2020-02-13 10:44:57 +00:00
Benedict Wong
db38170ec9 Implement Ikev2VpnRunner
This change adds the implementation for IKEv2/IPsec VPNs.

Bug: 144246767
Test: Manually tested
Change-Id: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76
2020-02-13 00:33:44 -08:00
Automerger Merge Worker
ae9661a4f6 [automerger skipped] Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: ba3cedd7f1 am: 4d22d8279f am: 994e4c7f01 -s ours
am skip reason: Change-Id I559d42089aeb09801d14c251c5165fca793c3cb3 with SHA-1 845c63755c is in history

Change-Id: I312db6a0bd341833c53f83be3d72da5b1bf9d7cf
2020-02-13 07:29:44 +00:00
Automerger Merge Worker
994e4c7f01 Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: ba3cedd7f1 am: 4d22d8279f
Change-Id: Iebeb70078906b5eb12b17ee14c8ac7ea749917b2
2020-02-13 07:09:24 +00:00
Automerger Merge Worker
4d22d8279f Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: ba3cedd7f1
Change-Id: I2f9de2582025c8fc3782870b8c561ce2002abaf8
2020-02-13 06:54:50 +00:00
Chiachang Wang
ba3cedd7f1 Merge "Add permission check for CaptivePortal#reevaluateNetwork" 2020-02-13 06:41:53 +00:00
Chiachang Wang
f326690d6f Add Intdef annotation for eventId in logEvent
Follow API guide.

Bug: 148379628
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I410ef06b2fa82d8ef35513086733b0fc2cf0fe06
2020-02-13 06:26:35 +00:00
Chiachang Wang
b195328782 Merge "Add permission check for CaptivePortal#reevaluateNetwork" 2020-02-13 06:25:32 +00:00
Automerger Merge Worker
971b42ac8f [automerger skipped] Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 32e18bea08 am: e04b0f689b am: b04621eb3c -s ours
am skip reason: skipped by user rpius

Change-Id: I32f14eb9d9157a2e139b239d091c80b710b29e57
2020-02-13 00:31:25 +00:00
Automerger Merge Worker
b04621eb3c Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 32e18bea08 am: e04b0f689b
Change-Id: I5784b867346a280307966721cd47e562fffcbe17
2020-02-13 00:06:04 +00:00
Automerger Merge Worker
e04b0f689b Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 32e18bea08
Change-Id: I00dd341f699d2a22cc3d190b43314a49bee9062a
2020-02-12 23:55:00 +00:00
Roshan Pius
32e18bea08 Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" 2020-02-12 23:36:13 +00:00
Roshan Pius
fb61a94a88 Revert "NetworkRequest: Embed requestor uid & packageName"
This reverts commit 31f7152793.

Reason for revert: b/149425896
Bug: b/149425896

Change-Id: I9fe31509c040cc421ccb00ea60f15e6f199e8bc6
2020-02-12 23:33:43 +00:00
Automerger Merge Worker
cad4b8f631 [automerger skipped] Merge "NetworkRequest: Embed requestor uid & packageName" am: 0964d02bcd am: 8ddf2cd025 am: 176c19b4d6 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 d26ae41442 is in history

Change-Id: Ie84d552bda61e5f3e5e1000eb6496a5d5da165b2
2020-02-12 19:04:02 +00:00
Automerger Merge Worker
176c19b4d6 Merge "NetworkRequest: Embed requestor uid & packageName" am: 0964d02bcd am: 8ddf2cd025
Change-Id: Icdf8417670f1ff3e68f90d8c3dc5a52d9c024f00
2020-02-12 18:58:41 +00:00
Automerger Merge Worker
8ddf2cd025 Merge "NetworkRequest: Embed requestor uid & packageName" am: 0964d02bcd
Change-Id: Ic4f9247e18a9d1cc22b26500b47da1af2d9b011d
2020-02-12 18:51:59 +00:00
Qingxi Li
0964d02bcd Merge "NetworkRequest: Embed requestor uid & packageName" 2020-02-12 18:43:32 +00:00
Automerger Merge Worker
2310c8b694 Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." am: 3dbf6f6949 am: ec0a4b6791 am: 489b7adcf8
Change-Id: Iae8c37ceeae1616b2b0edc43248e72f3de082f20
2020-02-12 17:50:39 +00:00
Automerger Merge Worker
489b7adcf8 Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." am: 3dbf6f6949 am: ec0a4b6791
Change-Id: Ifc6f6a919986305002d2e2c60aa3cda8f0b8b5ac
2020-02-12 17:32:19 +00:00
Cody Kesting
ec0a4b6791 Merge "Include NetworkCapabilities and LinkProperties in DataStallReport."
am: 3dbf6f6949

Change-Id: If2157b0dd7d62560c77318b76e0d7d2a66c09644
2020-02-12 09:16:41 -08:00
Cody Kesting
3dbf6f6949 Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." 2020-02-12 16:38:38 +00:00
Automerger Merge Worker
24ef2d6098 Merge changes from topic "NS-A44_lingerstate" am: 47be84c872 am: faadf36430 am: 2fdf36c01b
Change-Id: Ic9ea1c879cfcf145f569a388b52c6b7de0e8bb87
2020-02-12 16:00:34 +00:00
Automerger Merge Worker
2fdf36c01b Merge changes from topic "NS-A44_lingerstate" am: 47be84c872 am: faadf36430
Change-Id: If045bc0da9babaf9d5a67031986c1fe4d75f2dc3
2020-02-12 15:48:31 +00:00
Automerger Merge Worker
faadf36430 Merge changes from topic "NS-A44_lingerstate" am: 47be84c872
Change-Id: Ibec8f280ad0b256d3d9b065a541063fc63d5a356
2020-02-12 15:29:30 +00:00
Chalard Jean
47be84c872 Merge changes from topic "NS-A44_lingerstate"
* changes:
  [NS B10] Cleanup : remove mRematchedNetworks
  [NS B09] Create NetworkRanker
  [NS B08] More simplification
  [NS B07] More simplification
  [NS B06] Simplification
  [NS B05] Remove old dead code
  [NS B04] Make the network selection request-major.
  [NS B03] Add debug log showing the reassignment
  [NS B02] Split out a function to apply a NetworkReassignment
  [NS B01] Move the computation loop to a separate function
  [NS A44 2/2] Apply requests after all networks rematching is computed
  [NS A44 1/2] Update linger state before processing listens
2020-02-12 15:13:10 +00:00
Chalard Jean
88e5b87102 [NS B10] Cleanup : remove mRematchedNetworks
This is better computed by the code that applies the change
than by the code that computes the reassignment

Test: FrameworksNetTests
Change-Id: I13e2764fd9b29145499085c3bb56de88a97d6c3c
2020-02-12 21:23:45 +09:00
Chalard Jean
58d486ce9b [NS B09] Create NetworkRanker
Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ia534247144f479fe896e1a6e05b906103cd10005
2020-02-12 20:57:45 +09:00
Chalard Jean
32c2090b4d [NS B08] More simplification
Only computing the reassignment does not actually change the
default network.

Test: FrameworksNetTests
Change-Id: I21ddf5cc1e3d3817055dbda4246e38ceb0732407
2020-02-12 20:57:44 +09:00
Chalard Jean
75f7b1a2a7 [NS B07] More simplification
The new reassignment does not contain these useless lines
any more.

Test: FrameworksNetTests
Change-Id: I1583aebe94e529ce2b36e191a6e1f49c976bf29a
2020-02-12 20:57:44 +09:00
Chalard Jean
8049afd48d [NS B06] Simplification
This check is now unnecessary, seeing how the code adding these
changes is now guaranteed to only add at most one change for
each request.

Test: FrameworksNetTests
Change-Id: Ia0443602d9c89ee413e956df9c7b79f8f74813f7
2020-02-12 20:57:43 +09:00
Chalard Jean
a58fdce574 [NS B05] Remove old dead code
Test: FrameworksNetTests
Change-Id: I553721b327b76ede0e76b9fb7a0130fcae012175
2020-02-12 20:52:17 +09:00
Chalard Jean
013fb14441 [NS B04] Make the network selection request-major.
This patch marks the most important turning point of this
refactoring. Cleanups removing unused code will follow.

Replace the old network-major reassignment computation with a
much simpler and faster loop that takes each request and assigns
it the highest-scoring network.

All tests pass, of course.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ie143802995155151a38a4eb1d2f26c3f29e556bd
2020-02-12 20:52:17 +09:00
Chalard Jean
373391b2cd [NS B03] Add debug log showing the reassignment
dumpString for a reassignment looks like :

NetworkReassignment :
  Rematched networks : [100 CELLULAR], [101 WIFI]
  6 : 100 → 101
  8 : null → 101

toString looks like :

NetReassign [4 : 100 → 101, 5 : null → 101]

If no changes, then it looks like
NetworkReassignment : no changes

Bug: 113554781
Test: Manual
Change-Id: If9eeadb7ee317dee2d91ca1feca3091ae39e9bae
2020-02-12 20:52:17 +09:00
Chalard Jean
d4a4a30aef [NS B02] Split out a function to apply a NetworkReassignment
This makes the rematchAllNetworksAndRequests function, which
is the nexus of the rematching code, very straightforward and
easy to read.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: I5cea4ed7e06439494700d88ab202b696402fa360
2020-02-12 20:52:17 +09:00
Chalard Jean
42909302fb [NS B01] Move the computation loop to a separate function
Bug: 113554781
Test: FrameworksNetTests
Change-Id: I6c28c7af5c600d35aa1e9328b6c988dadb921f51
2020-02-12 20:52:17 +09:00
Chalard Jean
208f81bb50 [NS A44 2/2] Apply requests after all networks rematching is computed
This patch finally separates completely computing the rematch
from all the side effects. A collateral effect of this is to
compute correctly the background network state in
rematchNetworkAndRequests, which compensates the breakage
from the previous patch.

Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: I998c729c385940168fcd6ba3f2e01911f1844ce1
2020-02-12 20:52:17 +09:00
Chalard Jean
1a1d2783cb [NS A44 1/2] Update linger state before processing listens
To compute accurately whether a network is in the background, the
linger state needs to be updated. Do that before computing whether
a network is in the background and possibly calling
applyBackgroundChangeForRematch.

However ! As of this patch, rematchNetworksAndRequests computes
a wrong value when adding to the list of affected networks, because
it is looking at intermediate global state. Somehow this used to
compensate exactly for the way reading back the state was wrong.
There might have been a few undetected bugs there, but none is
known.

As such, as of this patch, rematchNetworksAndRequests still
computes a wrong value while the computation when applying that
state now computes the right one, so the tests do not pass.
This patch must be checked in together with A44 2/2 which will
fix the computation in rematchNetworksAndRequests, but is kept
separate for ease of review.

Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: Iaeed0d11bfa09f292f232ae020e944e430bc0184
2020-02-12 20:52:17 +09:00
Chiachang Wang
1fa770dc9e Add permission check for CaptivePortal#reevaluateNetwork
CaptivePortal#reevaluateNetwork is added as a system API which
requires a proper permission check.

Bug: 148379628
Test: Manually check with captive portal
Test: atest FrameworksNetTests
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I3f974339d5bd53a6f6ecb0842c02a8264dc3a5f9
Merged-In: I559d42089aeb09801d14c251c5165fca793c3cb3
2020-02-12 11:29:24 +00:00
Chiachang Wang
845c63755c Add permission check for CaptivePortal#reevaluateNetwork
CaptivePortal#reevaluateNetwork is added as a system API which
requires a proper permission check.

Bug: 148379628
Test: Manually check with captive portal
Test: atest FrameworksNetTests
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I559d42089aeb09801d14c251c5165fca793c3cb3
2020-02-12 11:28:55 +00:00
Automerger Merge Worker
eae2ac95b0 [automerger skipped] Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d am: 5177c42147 am: d8b184d809 -s ours
am skip reason: Change-Id I35fc4a814238635fa95981649c27230dda319afa with SHA-1 ac2dee9f70 is in history

Change-Id: I12a9deb9ada16ad5438844a1b057047188ecc05b
2020-02-12 06:51:35 +00:00
Automerger Merge Worker
9404fe8a48 [automerger skipped] Add a systemapi constructor for NetworkAgent am: 1a8802b0e1 am: de6d7d5a25 am: b92adf5eae -s ours
am skip reason: Change-Id I288ea32fac07a9a486e2ea451a2c9b098446a74c with SHA-1 124ecc47bf is in history

Change-Id: I5e28684a0aa3734b53b1316823b179b9895d0793
2020-02-12 06:51:31 +00:00
Automerger Merge Worker
d8b184d809 Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d am: 5177c42147
Change-Id: Ie9e18056da529defae5c5a0065607cd972d30b80
2020-02-12 06:35:42 +00:00
Automerger Merge Worker
b92adf5eae Add a systemapi constructor for NetworkAgent am: 1a8802b0e1 am: de6d7d5a25
Change-Id: I091a6c7d8e92c22ca9393b5c974fcda5356d4102
2020-02-12 06:35:39 +00:00
Automerger Merge Worker
5177c42147 Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d
Change-Id: I6eb675ddfa609dcc3031e916ce49959e42cf53f6
2020-02-12 06:25:49 +00:00