Commit Graph

4518 Commits

Author SHA1 Message Date
Lorenzo Colitti
0128c7f4fa Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: 76715955e0 am: fd496bf6ad
am: 51fdc7870c

Change-Id: I12108d96e29bfe71406106c2af950a6d6a9f8351
2018-01-19 16:46:11 +00:00
Lorenzo Colitti
51fdc7870c Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: 76715955e0
am: fd496bf6ad

Change-Id: I1ac9d349850d607c5fbf4a47760bc09de1c18043
2018-01-19 16:37:44 +00:00
Lorenzo Colitti
fd496bf6ad Merge changes Id8776d14,Ifa291c62,I5ea9d200
am: 76715955e0

Change-Id: I7a0b01cba8bdee67cffabddacb4ff5f4591cbc34
2018-01-19 16:30:17 +00:00
Treehugger Robot
76715955e0 Merge changes Id8776d14,Ifa291c62,I5ea9d200
* changes:
  Track and persist in stats whether traffic is on the default network.
  Add the default network to NetworkStats and NetworkStatsCollection.
  Pass all default networks to NetworkStatsService
2018-01-19 14:48:52 +00:00
Lorenzo Colitti
e2e04f14d5 Track and persist in stats whether traffic is on the default network.
This change adds the defaultNetwork to the ident based on current
system networking state, and persists that value to flash.

Bug: 35142602
Test: runtest frameworks-net
Test: downloaded files using default/non-default networks while watching dumpsys netstats
Change-Id: Id8776d149b2977548a9eb455ad4926af55e25aba
2018-01-19 19:49:16 +09:00
Lorenzo Colitti
e9a6d36fb3 Add the default network to NetworkStats and NetworkStatsCollection.
This allows us to maintain NetworkStats entries that track
whether the traffic was on the default network.

At the moment, the stats collection code always passes in
DEFAULT_NETWORK_NO. However, this value is a no-op, since it is
not persisted to disk. Only the ident, the uid/set/tag, and the
packet/byte/operation counters are persisted.

A future change will add defaultNetwork to the ident and start
persisting it.

Bug: 35142602
Test: runtest frameworks-net
Change-Id: Ifa291c62c0fa389b88e5561086a29dcd7cee2253
2018-01-19 19:49:16 +09:00
Lorenzo Colitti
a9dcce5a67 Pass all default networks to NetworkStatsService
This will allow NetworkStatsService to treat traffic on these
networks differently from traffic where the app selects a network
that is not the default.

Bug: 35142602
Test: runtest frameworks-net
Change-Id: I5ea9d200d9fb153490c6108bb9390bf152f297da
2018-01-19 16:40:10 +09:00
Jeff Sharkey
e784aa6485 Merge "Add ability to override subscriber capabilities." am: d6cd4b241a am: 754d687b0d
am: e81421a3c2

Change-Id: I46a6c87751494afca6fdd13736d7a4877e3cc833
2018-01-19 05:25:20 +00:00
Jeff Sharkey
e81421a3c2 Merge "Add ability to override subscriber capabilities." am: d6cd4b241a
am: 754d687b0d

Change-Id: Ib22d57c7cde75560cfd5bdd71b75d29b1056f783
2018-01-19 01:11:41 +00:00
Jeff Sharkey
754d687b0d Merge "Add ability to override subscriber capabilities."
am: d6cd4b241a

Change-Id: Id035d437e9b297ba70ba9231f6cfdd44e5b9c257
2018-01-19 01:04:32 +00:00
Jeff Sharkey
01ee403080 Add ability to override subscriber capabilities.
In a future set of CLs, NPMS will offer to override a handful of
capabilities on a per-subId basis.  Define a no-op version of the
interface to make it easier to add new methods in the future.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: bit FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DataConnectionTest
Bug: 64133169
Change-Id: I03dfd98463861f0338c4174e8d8a88c300ea5b55
2018-01-18 14:46:13 -07:00
Jeff Sharkey
d879ce75f5 Merge "Add "not congested" network capability." am: f2ca25f0cb am: b5d8ecb02b
am: 76a671b688

Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61
2018-01-18 04:20:44 +00:00
Erik Kline
dba2c8ee63 Merge "Add basic resolution of Private DNS hostname" am: 90310d279e am: 1015443681
am: 1fbfffe431

Change-Id: Iacdad88b49aff3e34afc93acfb8d3eeca9745c43
2018-01-18 04:10:12 +00:00
Jeff Sharkey
76a671b688 Merge "Add "not congested" network capability." am: f2ca25f0cb
am: b5d8ecb02b

Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6
2018-01-18 04:10:00 +00:00
Erik Kline
1fbfffe431 Merge "Add basic resolution of Private DNS hostname" am: 90310d279e
am: 1015443681

Change-Id: Ifc776c67025925fbeb2c13038ae78061c32567f5
2018-01-18 04:02:46 +00:00
Jeff Sharkey
b5d8ecb02b Merge "Add "not congested" network capability."
am: f2ca25f0cb

Change-Id: I02ea25610df63b40547c3114c0f9a9ef59560e90
2018-01-18 03:58:13 +00:00
Erik Kline
1015443681 Merge "Add basic resolution of Private DNS hostname"
am: 90310d279e

Change-Id: I9ce3476d80b05c140a02aaf1c21d4da2a68a8909
2018-01-18 03:54:50 +00:00
Lorenzo Colitti
392819336e Merge "Add public API methods for private DNS." am: 05b54efcb3 am: d5b2824f06
am: 84c003df97

Change-Id: Icd04bc83624ea4d13ac7737e6f9a7b0c5f0f7314
2018-01-18 03:36:37 +00:00
Jeff Sharkey
f2ca25f0cb Merge "Add "not congested" network capability." 2018-01-18 03:28:34 +00:00
Lorenzo Colitti
84c003df97 Merge "Add public API methods for private DNS." am: 05b54efcb3
am: d5b2824f06

Change-Id: I8d5a5b72c128231cca1dfb00bc00e887b5fbfc53
2018-01-18 03:27:51 +00:00
Lorenzo Colitti
d5b2824f06 Merge "Add public API methods for private DNS."
am: 05b54efcb3

Change-Id: If2bdfb05fcb235888bf272e4cfddb14619fc3f78
2018-01-18 03:21:02 +00:00
Treehugger Robot
90310d279e Merge "Add basic resolution of Private DNS hostname" 2018-01-18 02:44:53 +00:00
Lorenzo Colitti
05b54efcb3 Merge "Add public API methods for private DNS." 2018-01-18 01:17:17 +00:00
nharold
5a826ab8ff Merge "IpSec - API Tweak for removeTransportModeTransform" am: dc88d02119 am: 71aa19dcbf
am: 9e5c53789f

Change-Id: I479c24d9ac5d4b022ec6310395fdb4274cfd5598
2018-01-17 20:50:14 +00:00
dalyk
83b5fa28ec Add public API methods for private DNS.
Test: Small modifications to LinkProperties test.
Bug: 71828272
Change-Id: Id2f5acb5469132ec4a917837739f42085c71498e
2018-01-17 15:46:21 -05:00
nharold
9e5c53789f Merge "IpSec - API Tweak for removeTransportModeTransform" am: dc88d02119
am: 71aa19dcbf

Change-Id: Id9e9ab09669a53f53f03e5a6e0e4757434c3f3f3
2018-01-17 20:39:29 +00:00
nharold
71aa19dcbf Merge "IpSec - API Tweak for removeTransportModeTransform"
am: dc88d02119

Change-Id: I0ed7128014bbca8973f84d719449dcf70da45fa2
2018-01-17 20:31:15 +00:00
nharold
dc88d02119 Merge "IpSec - API Tweak for removeTransportModeTransform" 2018-01-17 19:07:10 +00:00
Erik Kline
c06d4f9be4 Add basic resolution of Private DNS hostname
Test: as follows
    - built
    - flashed
    - booted
Bug: 34953048
Bug: 64133961
Change-Id: I0a2289ea51a9294352c91d2ead23730d9b0333a5
2018-01-17 23:17:08 +09:00
nharold
c6fd947728 Merge changes from topic "ipsec-oneway-transform" am: 6987ca3620 am: 6e22cf92e6
am: 553288c304

Change-Id: I2a90cf423a3ac9a0526831ef767ad019e7be053c
2018-01-17 10:07:33 +00:00
Nathan Harold
befb36b962 Make Transforms Unidirectional am: a47ac2bb32 am: 9bbf7ac609
am: 8534382fa6

Change-Id: I608be255a307891ec3fe2d97cda817d75240c95c
2018-01-17 10:03:31 +00:00
nharold
553288c304 Merge changes from topic "ipsec-oneway-transform" am: 6987ca3620
am: 6e22cf92e6

Change-Id: I58fe595ff14e3ee6be5191171367e8a2f7fad6da
2018-01-17 09:53:37 +00:00
Nathan Harold
8534382fa6 Make Transforms Unidirectional am: a47ac2bb32
am: 9bbf7ac609

Change-Id: Ie3ca37e14d977fd255a7791ae3332ddda29ab37e
2018-01-17 09:50:37 +00:00
nharold
6e22cf92e6 Merge changes from topic "ipsec-oneway-transform"
am: 6987ca3620

Change-Id: If98285e2bd41e2eedaf81f1ff0e5f2b2d3827f91
2018-01-17 09:42:03 +00:00
Nathan Harold
9bbf7ac609 Make Transforms Unidirectional
am: a47ac2bb32

Change-Id: I7e80c75b3b227fdd16479120d8b7203cc5f28d1c
2018-01-17 09:37:57 +00:00
Jeff Sharkey
d616b20c17 Add "not congested" network capability.
Can be used by a network to indicate when it's congested, meaning that
apps should defer network traffic that could be done at a later time.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.VpnTest,com.android.server.ConnectivityServiceTest
Bug: 64133169
Change-Id: I8a60b6f02dd0f42268b59690556c16335d34e220
2018-01-17 02:27:04 -07:00
Nathan Harold
2c97b2e3af IpSec - API Tweak for removeTransportModeTransform
Because IpSecTransforms are now unidirectional,
and because the only mechanism for removing Transforms
removes it from both directions, the API can no longer
use the Transform parameter to meaningfully validate
that the caller had applied a transform. Since that
functionality was as-yet unimplemented and is now
infeasible, the transform parameter is removed.

Bug: 72079356
Test: cts - IpSecManagerTest; runtest frameworks-net
Change-Id: If19b0d34bdc6daf31a40d6d62bff326dcbca08c0
2018-01-17 01:11:46 -08:00
nharold
6987ca3620 Merge changes from topic "ipsec-oneway-transform"
* changes:
  Update IpSecService UnitTests
  Make Transforms Unidirectional
2018-01-17 08:40:37 +00:00
Nathan Harold
e0d099dfb3 Update IpSecService UnitTests
The IpSecService Unit tests relied on the
directionality of the IpSecConfig and previously
did not specify a source address. Unit tests
updated without functional change other than to
address these two requirements.

Bug: 71717213
Test: runtest frameworks-net
Change-Id: Iedbed735bc50fd4fdfe985f9e173956062a7b0d1
2018-01-16 19:38:10 -08:00
Nathan Harold
a47ac2bb32 Make Transforms Unidirectional
Convert the IpSecTransform from being a bi-directional
pair of SAs to a unidirectional single SA. This CL
also removes the concept of "direction from SAs meaning
that a IpSecTransform may now be applied to a socket
in either direction.

-Make transforms unidirectional
-Add Convert allocateSpi() to use destination rather
 than direction and remote address
-Remove directionality from builders for IpSecTransform
-Change applyTransportModeTransform() to take a
 direction in which to apply the transform object.
-Additional minor naming updates
-Restrict IpSecConfig to only print keys on eng builds
-Move DIRECTION constants to IpSecManager
-Add sourceAddress parameter to IpSecTransform to provide
 additional guarantees about the source address of data;
 (explicit failure rather than implicit failure).
-Move SPI to the build() method of IpSecTransform

Bug: 71717213
Test: runtest frameworks-net, CTS - IpSecManagerTest
Change-Id: I0824b37f443f4b8c62536d9801238c63ed8f2a1c
2018-01-16 11:08:31 -08:00
Lorenzo Colitti
b073a4beb6 Merge changes I0d0c0fac,Ifb9b00b6 am: b29d74c625 am: bfaf963337
am: aa9180b43f

Change-Id: I919f21566d5caff9fb35f57c439048b9b48f0971
2018-01-16 18:59:02 +00:00
Lorenzo Colitti
aa9180b43f Merge changes I0d0c0fac,Ifb9b00b6 am: b29d74c625
am: bfaf963337

Change-Id: Ie943428132fbcfcc565d54b46830ed297227ef35
2018-01-16 18:41:46 +00:00
Treehugger Robot
b29d74c625 Merge changes I0d0c0fac,Ifb9b00b6
* changes:
  Split updateCapabilities into two methods.
  More strictly check NetworkCapabilities callbacks.
2018-01-16 14:25:13 +00:00
Lorenzo Colitti
3bd4e209b9 Merge "Update netId to nethandle mapping in NetworkTest." am: 42293ba74d am: 503135596b
am: dd7216316d

Change-Id: I6feaa589fc43ff8ee1635be0fbd58aaa25679a5a
2018-01-16 13:46:46 +00:00
Lorenzo Colitti
dd7216316d Merge "Update netId to nethandle mapping in NetworkTest." am: 42293ba74d
am: 503135596b

Change-Id: I5e8e57f38580742eae38f63f43e37cc647412212
2018-01-16 13:34:46 +00:00
Lorenzo Colitti
726641197d Split updateCapabilities into two methods.
This makes the code a bit easier to follow.

Test: ConnectivityServiceTest continues to pass
Change-Id: I0d0c0facc1e3ba07b53542b35da40ddc096ff92e
2018-01-16 21:25:10 +09:00
Treehugger Robot
42293ba74d Merge "Update netId to nethandle mapping in NetworkTest." 2018-01-16 12:23:02 +00:00
Hugo Benichi
548498fd1c Merge "MacAddress: add @NonNull annotations" am: 7d767a4710 am: a7c125e5b2
am: b2cf723e43

Change-Id: Ib525e2429609ce12c2be5bbeacffa217b65bebe3
2018-01-16 10:40:56 +00:00
Hugo Benichi
b2cf723e43 Merge "MacAddress: add @NonNull annotations" am: 7d767a4710
am: a7c125e5b2

Change-Id: Icaa08c082797c6dbc3382e0662e24e1c84114175
2018-01-16 10:30:20 +00:00
Lorenzo Colitti
9499a55b90 Update netId to nethandle mapping in NetworkTest.
Bug: 63052780
Test: NetworkTest now passes
Change-Id: I5f1cb3055b7042a19afb5dd62f082912157612ba
2018-01-16 17:19:04 +09:00