Commit graph

5,954 commits

Message SHA1
Move NetworkStack to services.net
NetworkStack is only used in services.net or clients of services.net. It
cannot stay in framework.jar because it needs to depend on AIDL
interfaces, which would conflict with app implementations if they were
in framework.jar.

(cherry-pick of aosp/905233 with trivial conflicts in SystemServer.java)

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: I501b125a388c1100c2182bde4670944c2f0d7a02

Remi NGUYEN VAN   commited 2019-02-14 20:43:43 +09:00
4e4f8da24b
Remove NetworkMonitor dependency on ICaptivePortal
ICaptivePortal is used in the framework and cannot be used as a
dependency in NetworkMonitor, as the framework class takes precedence
when linking.
Also fix NetworkMonitorTest that was not verifying the right
startCaptivePortalApp call.

(cherry-pick of aosp/904953 with minor conflict in Android.bp)

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: Ib6a89e54312628662b130fbeec18d11e139f09fa

Remi NGUYEN VAN   commited 2019-02-14 20:36:40 +09:00
b68d1465ec
Merge "Remove hard-coded NetworkStack package name" am: 20bda51d6c am: dba80faaf0
am: ff38ce4336

Change-Id: Ic93c22e03a4ead4ec37b955993a32c8ce284e0a6

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-11 20:44:47 -08:00
2c47aed7dc
Merge "Remove hard-coded NetworkStack package name" am: 20bda51d6c
am: dba80faaf0

Change-Id: If82997f9f46a34014e797f10a71c34bfb4150585

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-11 20:34:20 -08:00
ff38ce4336
Merge "Remove hard-coded NetworkStack package name"
am: 20bda51d6c

Change-Id: I0e67a5e857d4f5ba2af1f0928be6d97c0f4ce94f

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-11 20:22:40 -08:00
dba80faaf0
Merge "Remove hard-coded NetworkStack package name"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-02-12 03:58:09 +00:00
20bda51d6c
Remove hard-coded NetworkStack package name
Have the network stack pass its package name in
showProvisioningNotification instead.

Bug: 124033493
Test: flashed, WiFi and captive portal works
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1f3312768ba1fb34e99a827e1fcdaf7510e318a8

Remi NGUYEN VAN   commited 2019-02-08 12:12:57 +09:00
8b3999ca8b
Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 641c68cfdb am: 9b177fe2f7
am: ebca092387

Change-Id: I0a52fc46a22d21147ab7d1594fd79182b5f23eb7

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-06 20:10:28 -08:00
d1cbc54cfb
Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 641c68cfdb
am: 9b177fe2f7

Change-Id: I5684b4fdc0e1030d372287d53f22b66fe8d90420

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-06 19:58:59 -08:00
ebca092387
Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService"
am: 641c68cfdb

Change-Id: I5bc7a8dae5667a1509f9741be571008a919b6461

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-06 19:50:15 -08:00
9b177fe2f7
Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-02-07 03:33:54 +00:00
641c68cfdb
Merge "Add API for NetworkStack to start captive portal" am: 26b11cdf44 am: 14b3b4bebc
am: 05c324d60a

Change-Id: I54a32dd01f1f697fc7da703bc1d258ed6a43df23

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-06 19:08:29 -08:00
c4e7c31749
Merge "Add API for NetworkStack to start captive portal" am: 26b11cdf44
am: 14b3b4bebc

Change-Id: Ie428acbfce0f94f0bade67258fefbb3253a539df

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-06 18:58:57 -08:00
05c324d60a
Merge "Add API for NetworkStack to start captive portal"
am: 26b11cdf44

Change-Id: I72166f14ec4f7589a1dbd0334de37530ebccf88e

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-02-06 18:49:45 -08:00
14b3b4bebc
Merge "Add API for NetworkStack to start captive portal"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-02-07 02:39:17 +00:00
26b11cdf44
Merge "[KA04] Expose TCP socket keepalive API" am: 68230eff94 am: d85bb7f373
am: d13c48d256

Change-Id: I490acd417b3f70ba1dec3bbf9f049088b849c782

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 07:41:19 -08:00
7de6676378
Merge "[KA04] Expose TCP socket keepalive API" am: 68230eff94
am: d85bb7f373

Change-Id: Ia5c108bfa42ab0de9d4cdf676c5980dc9a9aba12

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 07:31:44 -08:00
d13c48d256
Merge "[KA04] Expose TCP socket keepalive API"
am: 68230eff94

Change-Id: If8bc33ff30a529092802f9450a3772aaaa401c20

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 07:22:31 -08:00
d85bb7f373
Merge "[KA04] Expose TCP socket keepalive API"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-02-06 15:13:02 +00:00
68230eff94
[KA04] Expose TCP socket keepalive API
The new set of API allows applications to request keepalives
offload for established TCP sockets over wifi.

However, the application must not write to or read from the
socket after calling this method, until specific callbacks are
called.

Bug: 114151147
Test: atest FrameworksNetTests FrameworksWifiTests NetworkStackTests

Change-Id: I3880505dbc35fefa34ef6c79555458ecf5d296a4

junyulai   authored and   Chalard Jean   commited 2019-02-06 22:51:42 +09:00
c7ea1242ea
Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: cbd07b88ab am: f5805a6b5c
am: e8bba9c7d1

Change-Id: I700550160c795becb4c3e37a88328488846d272f

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 01:47:49 -08:00
80471e1fb5
Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: cbd07b88ab
am: f5805a6b5c

Change-Id: I3b0645585140d8ee12f896946a2a1fbb519e6195

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 01:38:31 -08:00
e8bba9c7d1
Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData"
am: cbd07b88ab

Change-Id: I3ee97cd66e19486ba0edd6cab58bd37b43a0904b

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 01:29:24 -08:00
f5805a6b5c
Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-02-06 09:19:07 +00:00
cbd07b88ab
Merge "Deprecate getActiveLinkProperties." am: e429dfd104 am: 69a894623b
am: dbe36dc5cf

Change-Id: I364a5420ab6552f652fa40a6607af249f92770c6

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 01:03:25 -08:00
6086acf462
Check MAINLINE_NETWORK_STACK in ConnectivityService
Treat NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK as equivalent to
NETWORK_STACK, CONNECTIVITY_INTERNAL and NETWORK_SETTINGS combined.
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK is defined as signature
permission in NetworkStackPermissionStub, which is signed with the
platform certificate, so requirements are the same for both permissions.

The permission is defined by NetworkStackPermissionStub and only used by
NetworkStack, which must be signed with the same key as the stub.

Test: flashed, booted, WiFi works, also with changes on top removing
      CONNECTIVITY_INTERNAL and NETWORK_SETTINGS
Bug: 112869080
Change-Id: I9d0ea8fc99eadf7e902421efdba9b8bf535658b8

Remi NGUYEN VAN   commited 2019-02-06 17:57:09 +09:00
7bfa1c0b2e
Merge "Deprecate getActiveLinkProperties." am: e429dfd104
am: 69a894623b

Change-Id: Iab302f94c8b33373831e1aa2aa4ff2beac9cf82f

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 00:54:12 -08:00
dbe36dc5cf
Merge "Deprecate getActiveLinkProperties."
am: e429dfd104

Change-Id: I745db0698d3fe76779e83c98aff9464a2b1b0709

Chalard Jean   authored and   android-build-merger   commited 2019-02-06 00:45:03 -08:00
69a894623b
Merge "Deprecate getActiveLinkProperties."
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-02-06 08:32:10 +00:00
e429dfd104
Add API for NetworkStack to start captive portal
Endpoints protected with INTERACT_ACROSS_USERS_FULL, such as
startActivityAsUser, should only be used by modules signed with the
platform cert. The NetworkStack needs to have the system server start
the application so this restriction can be applied.

Bug: 123846255
Test: flashed, captive portal works from primary and secondary user
Change-Id: Ib3e427b3fd03ced80c02985e795f79b096a2ec9a

Remi NGUYEN VAN   commited 2019-02-06 16:38:32 +09:00
f363f5f366
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
cc47b52a9c
Merge "[KA03] Support tcp keepalive offload" am: 5f8ddc2eb1 am: 0bebdf2e1e
am: 020998a27b

Change-Id: I55d7b285a75946713986163fbaa166d4b02513d4

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

Change-Id: I695f8a96348b3033bd20a2a9d42ac9ee2bd485ad

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 22:32:01 -08:00
020998a27b
Merge "[KA03] Support tcp keepalive offload"
am: 5f8ddc2eb1

Change-Id: I7715266c2c24d3f5dd65cd0e375d99b16be6aea6

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 22:19:41 -08:00
0bebdf2e1e
[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: I057dde79013b9eda5037b9a44f8eee06cc07352e

junyulai   authored and   Chalard Jean   commited 2019-02-06 14:07:39 +09:00
8c1586e956
[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
46f41d4b16
[automerger skipped] Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 292da961e6 am: 3527414d22
am: cba6514494 -s ours
am skip reason: change_id Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e with SHA1 3a5caf833b is in history

Change-Id: I6aea18280ee55740725a73d969a6485b69cb0521

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 11:08:36 -08:00
1cc7b5b8d1
Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 292da961e6
am: 3527414d22

Change-Id: I242fdacdd70729367f60da80a1a27d8f5a08dff6

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 10:39:31 -08:00
cba6514494
Merge "[KA02] internal cleanup and refactor for SocketKeepalive"
am: 292da961e6

Change-Id: I211be98b0d3f5e1c7068a241cbd7e913ae72c461

Chalard Jean   authored and   android-build-merger   commited 2019-02-05 10:25:01 -08:00
3527414d22
[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
21c06d06ce
[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
3a5caf833b
Merge changes from topic "bindprocess-resolv" am: 8b25d6c7d8 am: 79010e2cb5
am: 50a6165fc3

Change-Id: I3f35e6719db4a1152281d1143e8756e726d51e64

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-31 00:30:06 -08:00
6a723fdde2
Merge changes from topic "bindprocess-resolv" am: 8b25d6c7d8
am: 79010e2cb5

Change-Id: I80f85170981c2f5b1ef949b5db88baf5fc101cd0

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-31 00:19:37 -08:00
50a6165fc3
Merge changes from topic "bindprocess-resolv"
am: 8b25d6c7d8

Change-Id: I3aacc6c2ae5242e28eec6e9e8e2a9a4b3e4f715d

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-31 00:11:25 -08:00
79010e2cb5
Merge "Add get last entitlement value callback API" am: 13f0ce23a5 am: 5ba51d8c7f
am: 9fc829242d

Change-Id: If67c8d092dd2c40f95cbe423bc694aa349039541

Mark Chien   authored and   android-build-merger   commited 2019-01-30 23:59:01 -08:00
2b63e108ef
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
8b25d6c7d8
Merge "Add get last entitlement value callback API" am: 13f0ce23a5
am: 5ba51d8c7f

Change-Id: I42892bdacaa41f9cea7e653f0bb9b5497192e5f6

Mark Chien   authored and   android-build-merger   commited 2019-01-30 23:49:43 -08:00
9fc829242d
Merge "Add get last entitlement value callback API"
am: 13f0ce23a5

Change-Id: I1961297c3fa31f5575ae3a11a3fc90d695cb7de5

Mark Chien   authored and   android-build-merger   commited 2019-01-30 23:35:15 -08:00
5ba51d8c7f
Merge "Add get last entitlement value callback API"
Mark Chien   authored and   Gerrit Code Review   commited 2019-01-31 07:23:31 +00:00
13f0ce23a5
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
5bd499ca4b