Commit graph

5,160 commits

Message SHA1
Merge "Make requestRouteToHost a no-op for system callers." am: 6b6feb8ff8
am: 2fc0c62d6a

Change-Id: Iefddec95271b56007794fa10f7f3a4122c68877e

Lorenzo Colitti   authored and   android-build-merger   commited 2018-09-30 23:15:42 -07:00
3b2cdecbca
Merge "Make requestRouteToHost a no-op for system callers."
am: 6b6feb8ff8

Change-Id: I37ba2ef7ee7d052ec47c2d314f165315a13b06ac

Lorenzo Colitti   authored and   android-build-merger   commited 2018-09-30 23:00:08 -07:00
2fc0c62d6a
Merge "Make requestRouteToHost a no-op for system callers."
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-10-01 05:36:28 +00:00
6b6feb8ff8
Merge "Rename object mNetd to mNetworkManagementService" am: b28fee1994
am: cb9a018048

Change-Id: I1fcfcfb8828bf9b6206ddadede25d5e27b3c2908

Luke Huang   authored and   android-build-merger   commited 2018-09-30 20:28:15 -07:00
0687ae437f
Merge "Rename object mNetd to mNetworkManagementService"
am: b28fee1994

Change-Id: I658ba32a2396c393f3126b713d94ba809338d5e4

Luke Huang   authored and   android-build-merger   commited 2018-09-30 20:16:41 -07:00
cb9a018048
Merge "Fix idle timer rule leakage" am: c8019ecef2
am: 9bf2ab814b

Change-Id: I51ab9c7e58853ab93b09f1ca9e0c461134157c7d

Chiachang Wang   authored and   android-build-merger   commited 2018-09-30 20:10:04 -07:00
1fa4538303
Make requestRouteToHost a no-op for system callers.
Everything in the system should now be using proper multinetwork
APIs instead of this insecure and error-prone API.

Make this method do nothing when called by the system. For now,
keep the code around for backwards compatibility for apps
targeting Android releases before M.

Bug: 25824776
Bug: 25876485
Test: FrameworksNetTests pass
Test: CtsNetTestCasesLegacyApi22 pass
Test: CtsNetTestCasesLegacyPermission22 pass
Test: android.net.cts.ConnectivityManagerTest passes
Change-Id: I9b3557faccccc95c7b954db6a13b853b4c7edea0

Lorenzo Colitti   commited 2018-10-01 12:05:42 +09:00
2386291f56
Merge "Rename object mNetd to mNetworkManagementService"
Luke Huang   authored and   Gerrit Code Review   commited 2018-10-01 03:01:33 +00:00
b28fee1994
Merge "Fix idle timer rule leakage"
am: c8019ecef2

Change-Id: I5ac912d121d094b36d46ccca385d5cf319fcb945

Chiachang Wang   authored and   android-build-merger   commited 2018-09-30 19:57:18 -07:00
9bf2ab814b
Merge "Fix idle timer rule leakage"
Chiachang Wang   authored and   Gerrit Code Review   commited 2018-10-01 02:20:23 +00:00
c8019ecef2
Fix idle timer rule leakage
Idle timer rule is not cleared as expected if there is a
default network replacement.

Bug:37080406
Test: 1.run frameworks-net
      2.check iptables rule with default network replacement

Change-Id: I6bd29d79e4ca3e8de4b867c4fcb5f81d02ba6de4

Chiachang Wang   commited 2018-09-28 22:42:48 +08:00
087fd275f9
Merge "Call clearSettingsProvider before and after test" am: 3868fc30ee
am: a1a00cbbd1

Change-Id: I21123baaa211d19af181c970b7ad85051c7d08b7

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-09-28 07:40:45 -07:00
7233437b07
Merge "Call clearSettingsProvider before and after test"
am: 3868fc30ee

Change-Id: I38cae25353df48851280490d4593e70b49f0e6c0

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-09-28 07:28:31 -07:00
a1a00cbbd1
Rename object mNetd to mNetworkManagementService
No functionality change

Test: runtest frameworks-net passes
Change-Id: Ic3977eed9a86deb76ef0e4e12ffa17597bdecc30

Luke Huang   commited 2018-09-28 13:47:13 +08:00
5638081758
Call clearSettingsProvider before and after test
FakeSettingsProvider requires this method to be called before and after
use. Without this, the settings value or content provider may be cached
statically, so the test will be affected by code accessing settings
before it is run.

Bug: b/116668105
Test: atest FrameworksNetTests
Change-Id: I1480f3f3bbb17791752582a70327bb5c7c348d7c

Remi NGUYEN VAN   commited 2018-09-28 14:46:34 +09:00
b7c67f8e24
Merge "Add ConnectivityManager.getConnectionOwnerUid()" am: f8529dc891
am: 937c009070

Change-Id: I4ec4b9a8954deec001841566e0722caa1a3fa248

Jeffrey Vander Stoep   authored and   android-build-merger   commited 2018-09-21 14:48:32 -07:00
c5dd800f8c
Merge "Add ConnectivityManager.getConnectionOwnerUid()"
am: f8529dc891

Change-Id: Ib575a2a03c332d0143ed15652cc9c08c9cff694f

Jeffrey Vander Stoep   authored and   android-build-merger   commited 2018-09-21 14:26:19 -07:00
937c009070
Add ConnectivityManager.getConnectionOwnerUid()
Allow VPN apps to lookup the UID owner of a network connection.

Requires specifying the:
 - IP address and port for both the source and destination of a TCP
   connection.
 - IP address and port for either source and destination or just
   source for a UDP connection.
Only TCP and UDP protocols are supported. Only connections for UIDs
that apply to the calling VPN app will be resolved. This is intended
to replace direct app access to /proc/net/{tcp,tcp6,udp,udp6}.

The implementation uses netlink inet_diag sockets[1] to perform
the lookup on TCP sockets as well as UDP sockets when supported
(kernel has CONFIG_INET_UDP_DIAG=y).

[1] http://man7.org/linux/man-pages/man7/sock_diag.7.html

Bug: 9496886
Bug: 109758967
Test: atest HostsideVpnTests
Test: atest InetDiagSocketTest on Taimen with CONFIG_INET_UDP_DIAG
    and on Sailfish without CONFIG_INET_UDP_DIAG.
Change-Id: I2bbc7072dd091e2e653dadf6dc05024c04180f34

Jeff Vander Stoep   authored and   Jeffrey Vander Stoep   commited 2018-09-21 06:16:09 +00:00
39a51e0191
Merge changes into stage-aosp-master
am: 0ae414753a

Change-Id: I46d9e80464652ac98c7b745686aaa490d57a8ab0

Shaotang Li   authored and   android-build-merger   commited 2018-09-13 00:56:38 -07:00
fcc936b90d
Merge changes into stage-aosp-master
am: 56090a7d99

Change-Id: I6fa8268060713303c3d999fec0fd91aa78849872

Shaotang Li   authored and   android-build-merger   commited 2018-09-13 00:52:20 -07:00
aa799aaadf
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-09-13 07:27:15 +00:00
0ae414753a
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-09-13 07:27:15 +00:00
56090a7d99
Merge "Use UID as requestID" am: a2f1eb6cf3
am: 4742afd3a3

Change-Id: I0d9fb770482e72f3b017702ffb7ec144a64462e0

Benedict Wong   authored and   android-build-merger   commited 2018-09-12 15:22:39 -07:00
2f62a66f45
Merge "Use UID as requestID"
am: a2f1eb6cf3

Change-Id: Icef3693f5911c8f69076e0990392e28c693cbc22

Benedict Wong   authored and   android-build-merger   commited 2018-09-12 14:35:27 -07:00
4742afd3a3
Merge "Use UID as requestID"
Benedict Wong   authored and   Gerrit Code Review   commited 2018-09-12 18:51:33 +00:00
a2f1eb6cf3
Merge changes into stage-aosp-master
am: 741a4c94ac

Change-Id: If60b6361f323c651510900344d75ce5fa7db17c3

Andreas Gampe   authored and   android-build-merger   commited 2018-09-10 16:01:58 -07:00
09fdf8375e
Merge changes into stage-aosp-master
am: 2c825c0278

Change-Id: I4e707c0172a858db97d903ad79dadb37c7a910a7

Andreas Gampe   authored and   android-build-merger   commited 2018-09-10 15:58:08 -07:00
aa15c5aa07
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-09-10 22:43:03 +00:00
741a4c94ac
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-09-10 22:43:03 +00:00
2c825c0278
Merge changes Ie28e6c80,I3cb9b2ce am: 078f0ce714
am: 6946b28c1d

Change-Id: I550b2dd325dba38513eabb3ae8c94c2787fbbf70

Hugo Benichi   authored and   android-build-merger   commited 2018-09-04 23:24:07 -07:00
22a8d12365
Merge changes Ie28e6c80,I3cb9b2ce
am: 078f0ce714

Change-Id: I7e910aaed571c3c37fd4a5ba4d5a0eeb5f52c8bd

Hugo Benichi   authored and   android-build-merger   commited 2018-09-04 23:15:54 -07:00
6946b28c1d
Merge changes Ie28e6c80,I3cb9b2ce
* changes:
  ConnectivityService: dumpsys args for dumping networks or requests only.
  ConnectivityService: Sort requests and networks in dumpsys.

Hugo Benichi   authored and   Gerrit Code Review   commited 2018-09-05 05:54:24 +00:00
078f0ce714
ConnectivityService: dumpsys args for dumping networks or requests only.
This patch adds two arguments to ConnectivityService dumpsys handler so
that only current networks or only current requests are dumped:

- "adb shell dumpsys connectivity networks" will dump current networks.
- "adb shell dumpsys connectivity requests" will dump current requests.

Bug: none
Test: Compiled, flashed, booted, checked that both new dumpsys args work
      as expected.

Change-Id: Ie28e6c800795eb49f386b609e8222a25e73dfc84

Hugo Benichi   commited 2018-09-05 13:04:12 +09:00
5df91ce8be
ConnectivityService: Sort requests and networks in dumpsys.
This patch adds two utility functions for sorting requests and networks
tracked by ConnectivityService by request id and network id
respectively.

These utility functions are then used to improve the output of
adb shell dumpsys connectivity so that networks and requests are
printed in a more stable fashion.

Bug: none
Test: Compiled, flashed, booted, checked output of adb shell
      dumpsys connectivity.

Change-Id: I3cb9b2ceab64145611a416dcb8c5d512838a2626

Hugo Benichi   commited 2018-09-05 13:03:55 +09:00
a480ba57f5
Use UID as requestID
This change makes all requestIDs use the UID of the creator, ensuring
that rekeys always use the same requestID. This also has the nice
property of separating app's resources from each other, and allowing for
identification of which app/UID allocated the resources from
command-line dumps (eg ip xfrm state show)

Bug: 111841561
Test: Updated tests & passing taimen
Change-Id: I4f1eadcdb795766ae4682b15e41727359c52fa38

Benedict Wong   commited 2018-09-04 14:25:13 -07:00
c268c30491
Merge "PermissionMonitor: Limit preinstalled apps network permissions" am: cb0e6f589a
am: 41b3dd929f

Change-Id: I1478c932bf612fd4546c4178fc8f4a0bededf127

Paul Hu   authored and   android-build-merger   commited 2018-09-03 02:41:26 -07:00
0877d8650c
Merge "PermissionMonitor: Limit preinstalled apps network permissions"
am: cb0e6f589a

Change-Id: I173026e41ed11fa5f4c679a5759b55213e21b596

Paul Hu   authored and   android-build-merger   commited 2018-09-03 02:30:12 -07:00
41b3dd929f
Merge "PermissionMonitor: Limit preinstalled apps network permissions"
Paul Hu   authored and   Gerrit Code Review   commited 2018-09-03 09:16:52 +00:00
cb0e6f589a
PermissionMonitor: Limit preinstalled apps network permissions
Not all preinstalled apps should have access to background
networks or restricted networks. But we give them all network
access permissions currently, it's not a good design. So we
shall limit preinstalled apps permissions, they should just
request the appropriate permission for their use case from
the network permissions.

Bug:19610688
Test: runtest frameworks-net
Change-Id: I184ae3197208c979847ca134c8f01b32528badf1

paulhu   commited 2018-08-29 13:49:33 +08:00
c7a3a56e57
Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f
am: 89e36d45f7

Change-Id: I3199337fd168f58f13a547d4eaff2be069a22f3d

Erik Kline   authored and   android-build-merger   commited 2018-08-28 20:21:50 -07:00
50160c2f49
Merge "Remove ResolveUtil from frameworks/base callers"
am: 0e1621296f

Change-Id: Ibc885ccd9531706df029154f7ec4fde71bf600d1

Erik Kline   authored and   android-build-merger   commited 2018-08-28 20:12:49 -07:00
89e36d45f7
Remove ResolveUtil from frameworks/base callers
Use the Private DNS bypass logic that was moved into Network.

Once all callers of ResolvUtil are updated to use this interface
ResolvUtil can be deleted.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - connection to captive portal network detects portal correctly
      and the login activity functions as expected

Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486

Change-Id: If11ef2b5ffdc729f8449cf18dccd5f1eccbc51e6

Erik Kline   commited 2018-08-28 12:59:21 +09:00
767b7f2021
Merge "Fix typo in IpConfiguration comment" am: 43afefcd97
am: c03904e096

Change-Id: I0871973d37267215fc31455015a37e6a8a60d821

Blake Lawson   authored and   android-build-merger   commited 2018-08-23 21:17:32 -07:00
22bdadc546
Merge "Fix typo in IpConfiguration comment"
am: 43afefcd97

Change-Id: Ife540b3bda671dcb8016dae86f221a62063bd464

Blake Lawson   authored and   android-build-merger   commited 2018-08-23 21:08:12 -07:00
c03904e096
Merge "Fix typo in IpConfiguration comment"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-08-24 03:43:38 +00:00
43afefcd97
Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ... am: e01b4ce6c7
am: 1f3417b720

Change-Id: If4f9e1b498855af05011cbd0f529e346bebd4cbd

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-08-23 20:42:23 -07:00
8e31d1ab6a
Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ...
am: e01b4ce6c7

Change-Id: I1800eb214d501e76b8705a27ca817000d009736e

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-08-23 20:33:45 -07:00
1f3417b720
Fix typo in IpConfiguration comment
Bug: NONE
Test: NONE
Change-Id: Ib2ce166532292266da17ec85c16e400afe4f9111

Blake Lawson   commited 2018-08-23 08:43:07 -07:00
4253b45cbb
Add DhcpServingParams
Those parameters will be used to start DhcpServer or update its
configuration.

Test: runtest DhcpServingParamsTest.java
Bug: b/109584964
Change-Id: Id8d3dcf62d66dcb02accffa8d8500e30f07af452

Remi NGUYEN VAN   commited 2018-08-23 17:29:48 +09:00
aa3d9ac73b
Add util to add an ARP table entry
This is to be used by the new DhcpServer to add ARP entries with new
addresses before sending unicast responses.

Test: manual: cat /proc/net/arp with implementation based on this
Bug: b/109584964
Change-Id: I3559893583aa3c49b188ad689a41ee2f3e9d9bf3

Remi NGUYEN VAN   commited 2018-08-23 16:01:44 +09:00
029434e9ac