Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Merge "Deprecate getActiveLinkProperties." am: 39d46d221b am: 10a24f1d46
am: 7bb6a9ed3e

Change-Id: I364a5420ab6552f652fa40a6607af249f92770c6

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 01:03:25 -08:00
8ee0ccedf5
Merge "Deprecate getActiveLinkProperties." am: 39d46d221b
am: 10a24f1d46

Change-Id: Iab302f94c8b33373831e1aa2aa4ff2beac9cf82f

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 00:54:12 -08:00
7bb6a9ed3e
Merge "Deprecate getActiveLinkProperties."
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-02-06 08:32:10 +00:00
39d46d221b
Deprecate getActiveLinkProperties.
There are other, more idiomatic ways to do this. Deprecating this
with usage limited to P will curb usage and reduce the maintenance
load.
This also deprecates the extra EXTRA_NETWORK_TYPE, which has
survived from an old world but has only been used in deprecated
broadcasts for some time.

Bug: 109783091
Test: eyeball current.txt
Change-Id: I87b74833bb4ec362ee3fd07511a66d318c29067d

Chalard Jean   commited 2019-02-06 15:44:44 +09:00
97021a1eeb
Merge "[KA03] Support tcp keepalive offload" am: 5f8ddc2eb1 am: 0b93464e32
am: d6cedf5ed3

Change-Id: I55d7b285a75946713986163fbaa166d4b02513d4

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 22:41:37 -08:00
a627caa478
Merge "[KA03] Support tcp keepalive offload" am: 5f8ddc2eb1
am: 0b93464e32

Change-Id: I695f8a96348b3033bd20a2a9d42ac9ee2bd485ad

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 22:32:01 -08:00
d6cedf5ed3
[KA03] Support tcp keepalive offload
When offload is starting, socket will be switched to repair
mode. Read and write on the socket will not be allowed until
repair mode is turned off. If remote packet arrives, repair
mode will be turned off automatically and a callback will
be raised to indicate that socket is ready to read from.

Bug: 114151147
Test: -atest FrameworksNetTests
      -manual

Change-Id: I0c335865912e183e7ad32a8ea12188f02ccde5fd

markchien   authored and   Chalard Jean   commited 2019-02-06 12:22:22 +09:00
e5591ce2fa
Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 292da961e6
am: 839c99be82

Change-Id: I242fdacdd70729367f60da80a1a27d8f5a08dff6

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 10:39:31 -08:00
9a003aaebc
[KA02] internal cleanup and refactor for SocketKeepalive
In previous change, the new SocketKeepalive API was exported.
But internally, old PacketKeepalive names and structures are
still used.

This change rename them properly for code consistency and also
refactor KeepalivePacketData to support different types of
KeepalivePacketData.

Bug: 114151147
Test: 1. atest FrameworksNetTests
      2. atest FrameworksWifiTests
      3. atest FrameworksTelephonyTests

Change-Id: Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e
Merged-In: Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e

junyulai   authored and   Chalard Jean   commited 2019-02-05 20:13:47 +09:00
011b1f15c2
[KA02] internal cleanup and refactor for SocketKeepalive
In previous change, the new SocketKeepalive API was exported.
But internally, old PacketKeepalive names and structures are
still used.

This change rename them properly for code consistency and also
refactor KeepalivePacketData to support different types of
KeepalivePacketData.

(clean cherry-pick from aosp/860394)

Bug: 114151147
Test: 1. atest FrameworksNetTests
      2. atest FrameworksWifiTests
      3. atest FrameworksTelephonyTests

Change-Id: Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e

junyulai   authored and   Chalard Jean   commited 2019-02-04 04:06:22 +00:00
1fb0c95661
Merge changes from topic "bindprocess-resolv" am: af8e41c434 am: 4b8dee1177
am: 301ff56903

Change-Id: I3f35e6719db4a1152281d1143e8756e726d51e64

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-31 00:30:06 -08:00
1cb688eab8
Merge changes from topic "bindprocess-resolv" am: af8e41c434
am: 4b8dee1177

Change-Id: I80f85170981c2f5b1ef949b5db88baf5fc101cd0

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-31 00:19:37 -08:00
301ff56903
Merge "Add get last entitlement value callback API" am: 029be80b79 am: ffe3d99f91
am: 5433fa3269

Change-Id: If67c8d092dd2c40f95cbe423bc694aa349039541

Mark Chien   authored and   android-build-merger   commited 2019-01-30 23:59:01 -08:00
4ebd3aaf1e
Merge changes from topic "bindprocess-resolv"
* changes:
  Allow use of bindProcessToNetwork only to change private DNS bypass.
  Allow bypassing private DNS via bindProcessToNetwork.

Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-31 07:52:04 +00:00
af8e41c434
Merge "Add get last entitlement value callback API" am: 029be80b79
am: ffe3d99f91

Change-Id: I42892bdacaa41f9cea7e653f0bb9b5497192e5f6

Mark Chien   authored and   android-build-merger   commited 2019-01-30 23:49:43 -08:00
5433fa3269
Merge "Add get last entitlement value callback API"
Mark Chien   authored and   Gerrit Code Review   commited 2019-01-31 07:23:31 +00:00
029be80b79
Add get last entitlement value callback API
The callback would be used to notify entitlement value. If the
cache value indicates entitlement succeeded, it just fire
callback with cache value instead of run entitlement check.

Bug: 120887283
Test: atest FrameworksNetTests
Change-Id: I8afe928423bd75c54c61533a50a5c0814922ceb1

markchien   commited 2019-01-31 12:31:55 +08:00
0f45bb9d3d
Allow use of bindProcessToNetwork only to change private DNS bypass.
Currently it is not possible to change private DNS bypass by
doing:

  setProcessDefaultNetwork(network.getPrivateDnsBypassingCopy());
  setProcessDefaultNetwork(network);

because the code will ignore the change. Fix this by ensuring
that we always call bindProcessToNetwork (which does not have
side effects) and then only performing the expensive operations
(flushing DNS cache, upating socket pools) if the netId changed.

Bug: 112869080
Test: None
Change-Id: I5e8999cb11d8b8c1e9eb583fa8b3932f212accff

Lorenzo Colitti   commited 2019-01-31 13:08:24 +09:00
3c766ebc4d
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a am: bd757b5a3d
am: 2bdb01f0a0

Change-Id: I0ca587378c1db327c4e73b18ab5c1c2505f05ce0

Pavel Grafov   authored and   android-build-merger   commited 2019-01-30 14:50:00 -08:00
97640add4c
Merge "Add SystemApi for captive portal metrics" am: b591097458
am: 3efa288531

Change-Id: I15adc597039539d53e5c08dc5f8cac74bcb0eda2

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-30 14:42:34 -08:00
9002494f06
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a
am: bd757b5a3d

Change-Id: I7f0de294357ae6c691d38be52dd278eb37d42116

Pavel Grafov   authored and   android-build-merger   commited 2019-01-30 14:36:37 -08:00
2bdb01f0a0
Merge "Add SystemApi for captive portal metrics"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-30 22:24:12 +00:00
b591097458
Nuke old setAlwaysOnVpnPackageForUser method.
All callers have migrated to 4-argument one.

Test: builds
Bug: 77468593
Change-Id: I253515f6b0100b675505646339e5b82d373c9429

Pavel Grafov   commited 2019-01-30 19:56:36 +00:00
4ed5cbd750
Allow bypassing private DNS via bindProcessToNetwork.
Currently, bypassing private DNS requires calling the deprecated
setProcessDefaultNetworkForHostResolution. Allow apps to do this
via the non-deprecated binProcessForNetwork as well.

This has fewer backwards compatibility concerns than the
alternative approach of having setProcessDefaultNetwork call
setProcessDefaultNetworkForHostResolution. That approach would
have been problematic, for example, if an app did:

  cm.bindProcessToNetwork(network);
  ...
  cm.bindProcessToNetwork(null);

In this case, it would be difficult to know whether to clear the
resolver mapping as well: what if an app had also called
setProcessDefaultNetworkForHostResolution?

Similarly, it would be difficult to know what to do if an app did:

  cm.setProcessDefaultNetworkForHostResolution(network);
  cm.bindProcessToNetwork(null);

This approach does not have these concerns, and has no effect
on apps that don't call Network.getPrivateDnsBypassingCopy, which
regular apps don't have permission to use. It also provides a
path to deprecate setProcessDefaultNetworkForHostResolution.

Bug: 112869080
Test: atest android.net.cts.ConnectivityManagerTest android.net.cts.MultinetworkApiTest
Change-Id: I4158a37b6ed87a9a9b2677c526dcfee8af48e483

Lorenzo Colitti   commited 2019-01-31 00:55:47 +09:00
3a1cb9d615
Merge "Add SystemApi for captive portal metrics"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2019-01-30 15:19:07 +00:00
f2c71e5a8d
Add SystemApi for captive portal metrics
The metrics go through NetworkMonitor in the NetworkStack so that they
can be upgraded to new metrics in the future.

Test: flashed, captive portal login works, metrics shown in events log
Bug: 112869080
Merged-In: I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8
Change-Id: Ib5e2126788f8d56a00a56d7efcd33c5f9a37a6de

Remi NGUYEN VAN   commited 2019-01-30 22:54:27 +09:00
fb43a914d3
Add SystemApi for captive portal metrics
The metrics go through NetworkMonitor in the NetworkStack so that they
can be upgraded to new metrics in the future.

Test: flashed, captive portal login works, metrics shown in events log
Bug: 112869080
(Cherry-pick of aosp/890004)

Change-Id: I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8

Remi NGUYEN VAN   commited 2019-01-30 22:01:20 +09:00
6bd9193a3d
Tell the factory it is already serving a request.
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.

Gives each factory a serial number and propogates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.

Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.

This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.

Bug: 18637384
Bug: 29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e

Chalard Jean   commited 2019-01-30 15:41:57 +09:00
768ea1206d
Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c am: 19542eea9e
am: b7829c8fec

Change-Id: I2059d9cfa3015388301a74828255354b6dc23c23

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-29 21:42:29 -08:00
f71c4dfb77
Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c
am: 19542eea9e

Change-Id: I488fc028b8fd2aa5a09464082c65a4889a8a6b62

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-29 21:27:50 -08:00
b7829c8fec
Remove last NetworkStack usage of hidden APIs
Includes various small changes to stop using hidden APIs

Test: make NetworkStack
Test: flashed, booted, WiFi and tethering working
Bug: 112869080
Change-Id: Id2830795a444f484b377ed6437435a1cd833697a

Remi NGUYEN VAN   commited 2019-01-30 10:23:24 +09:00
6e82be4e4a
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe am: 5896eb1b1a
am: 03fe002386

Change-Id: Ib755bbfc5bb6bff4ada3995b70dfe8fc2d40b4f9

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-29 03:39:27 -08:00
d67edd1540
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
am: 5896eb1b1a

Change-Id: I978bdb626c1f4c8bbe736c8bad1c74fb6a67b4b5

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-29 03:29:01 -08:00
03fe002386
Add NetworkUtils utilities to SystemApi
attach*Filter and addArpEntry are necessary for the NetworkStack but are
only usable for apps that have system permissions.
Also includes system API for IpPrefix, LinkAddress, LinkProperties,
Network, and static modifier in ApfCapabilities that were missed in
previous CLs.

Test: Builds, flashed, WiFi works
Bug: 112869080
Change-Id: If141ae6a2f9145f5af64ba002ca44938f39b90a9

Remi NGUYEN VAN   commited 2019-01-29 17:30:26 +09:00
c7fe99fdbe
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e am: e90dc24b2c
am: d3e5405831

Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 23:47:36 -08:00
bb818c790f
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e
am: e90dc24b2c

Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 22:57:39 -08:00
d3e5405831
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c am: f6c5ef95d1
am: e4dab6797f

Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925

Pavel Grafov   authored and   android-build-merger   commited 2019-01-28 22:13:24 -08:00
0d31afb2a0
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c
am: f6c5ef95d1

Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3

Pavel Grafov   authored and   android-build-merger   commited 2019-01-28 21:34:03 -08:00
e4dab6797f
Merge "Add SocketUtils for NetworkStack"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-28 23:14:08 +00:00
37053eb78e
Merge "Whitelist packages from VPN lockdown."
Pavel Grafov   authored and   Gerrit Code Review   commited 2019-01-28 20:15:49 +00:00
76e3e0052c
Add SocketUtils for NetworkStack
These utilities can only be used for privileged apps. The underlying
implementation cannot be @SystemApi.

Test: m
Bug: 112869080
Change-Id: Idfa90561102e5b03ab2b79486d3ad46457128bf8

Remi NGUYEN VAN   commited 2019-01-28 20:11:27 +09:00
a628730d0a
Merge "Move NetworkUtils used by NetworkStack" am: 8f8deae60f
am: 249646cc60

Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 01:30:17 -08:00
8d31333b7d
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-28 09:06:20 +00:00
8f8deae60f
Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259
am: 5fb799d7ee

Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 00:35:46 -08:00
d08b6d2105
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2019-01-28 06:57:25 +00:00
b19997dbe9
Move NetworkUtils used by NetworkStack
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
(Cherry-pick of aosp/881952)
Change-Id: Ie20dcee375b377236004a7689890729493aca857

Remi NGUYEN VAN   commited 2019-01-28 13:45:46 +09:00
98d9df7a9b
Move NetworkUtils used by NetworkStack
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: Ie20dcee375b377236004a7689890729493aca857
Change-Id: Ib8d000529872796022706a35050fdc2c7141f2ab

Remi NGUYEN VAN   commited 2019-01-28 13:45:17 +09:00
e167e117c1
Add NetworkStack networking deps to SystemApi
Cherry-pick with conflicts fixed in CaptivePortalLoginActivity imports.
Test: atest FrameworksNetTests
Bug: 112869080
Merged-In: Id59dc06fb85e4ac88098f56b621ec880610759ce
Change-Id: I3c05e8fdd70497426d4fa433295c4fbdad07d9c9

Remi NGUYEN VAN   commited 2019-01-28 13:28:35 +09:00
8bd18cff9a
Merge "Add NetworkStack networking deps to SystemApi"
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-01-28 02:58:01 +00:00
1e67080e20
Whitelist packages from VPN lockdown.
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc

Pavel Grafov   commited 2019-01-25 19:59:03 +00:00
3aeb3f3455