Commit Graph

5181 Commits

Author SHA1 Message Date
Igor Murashkin
384127ccfe Merge changes into stage-aosp-master
am: 57ff7edf69

Change-Id: I2aac3fb3b6fa638e9c0cc871a02216ed498df98d
2018-10-05 11:57:18 -07:00
Igor Murashkin
7240b9200f Merge changes into stage-aosp-master
am: 526ef90850

Change-Id: I63acb13055109fc08fbe77d4dd6ebd68daeaabcd
2018-10-05 11:50:43 -07:00
Android Build Merger (Role)
57ff7edf69 Merge changes into stage-aosp-master 2018-10-05 17:35:26 +00:00
Android Build Merger (Role)
526ef90850 Merge changes into stage-aosp-master 2018-10-05 17:35:26 +00:00
Chalard Jean
a81b647e09 Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f
am: c75b9031f5

Change-Id: I4220b1964040affa39d8d748095a161b2512eccf
2018-10-05 02:33:45 -07:00
Chalard Jean
c75b9031f5 Merge "[PT10] Move loadGlobalProxy into ProxyTracker."
am: 79822ffb6f

Change-Id: If5d2eb35f1c990fc6af5747fb2f8e3d55afb7eb9
2018-10-05 02:22:44 -07:00
Chalard Jean
7b09bbf924 [PT10] Move loadGlobalProxy into ProxyTracker.
Test: runtest
Change-Id: Id1c57ebb575c8742310be4822ec6e3fa03f487c3
2018-10-05 16:37:38 +09:00
Andrew Solovay
78ca1bea52 resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 22:50:39 +00:00
Andrew Solovay
398c81ec8c docs: Replacing {#link with {@link
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.

Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.

Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.

Staged to:

go/dac-stage/reference/android/app/Instrumentation.html
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html
go/dac-stage/reference/android/bluetooth/BluetoothDevice.html
go/dac-stage/reference/android/bluetooth/BluetoothServerSocket.html
go/dac-stage/reference/android/inputmethodservice/InputMethodService.html
go/dac-stage/reference/android/view/KeyCharacterMap.html
go/dac-stage/reference/android/view/KeyEvent.html
go/dac-stage/reference/android/media/AudioManager.html
go/dac-stage/reference/android/net/wifi/WifiConfiguration.html

(Other files were not in the public Javadocs.)

Bug: 111925950
Test: make ds-docs
Exempt-From-Owner-Approval: Docs-only change
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 18:20:51 +00:00
Leif Hendrik Wilden
d4ff3bd58f Merge "Allow wifi and ethenet connected at same time." am: f0283ddd40
am: 978695ee48

Change-Id: I2b180336f74697ff5467c210eabccb4813ce317f
2018-10-02 11:06:14 -07:00
Leif Hendrik Wilden
978695ee48 Merge "Allow wifi and ethenet connected at same time."
am: f0283ddd40

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
2018-10-02 10:57:11 -07:00
Treehugger Robot
f0283ddd40 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
Leif Hendrik Wilden
a6521801cb Allow wifi and ethenet connected at same time.
This will improve the user experience on Android TV devices,
see bug for details.

In addition when connecting adb to the device by ethernet
for cts, wifi will not connect, causing lots of tests to fail.
For example:
[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties
[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_
manifestRequestOnlyPreN_shouldReceiveIntent

Use command:settings to put global wifi_data_always_on 1 to enable it.

Bug: 26102779
Test: Manual, CTS.
Change-Id: I711d93061a6bc7164d98a858912f781e1b967406
2018-10-01 09:12:10 -07:00
Luke Huang
6894baf23e Merge "ConnectivityService get INetd directly." am: d7e5a17900
am: df49789837

Change-Id: Ia6c32320eea3117f7a79a6360b7819c64a88faa5
2018-10-01 02:29:32 -07:00
Lorenzo Colitti
c64f740cf5 Merge "Remove spurious WTF in rematching networks." am: 5f2851ff02
am: 8d7b056325

Change-Id: Ia1f7426a2f75ed6e6264a932255f77e707968165
2018-10-01 02:23:37 -07:00
Luke Huang
df49789837 Merge "ConnectivityService get INetd directly."
am: d7e5a17900

Change-Id: I0efe022f74f3bcfe8b97853ef0d8c0d27a2d6b01
2018-10-01 01:23:23 -07:00
Lorenzo Colitti
8d7b056325 Merge "Remove spurious WTF in rematching networks."
am: 5f2851ff02

Change-Id: If2dc54d1486fe51a1800c140fd83811492e4134b
2018-10-01 01:19:02 -07:00
Luke Huang
d7e5a17900 Merge "ConnectivityService get INetd directly." 2018-10-01 07:28:42 +00:00
Treehugger Robot
5f2851ff02 Merge "Remove spurious WTF in rematching networks." 2018-10-01 06:33:29 +00:00
Lorenzo Colitti
4e2dc58c78 Merge "Make requestRouteToHost a no-op for system callers." am: a52ba6ba12
am: 5bc5203d68

Change-Id: Iefddec95271b56007794fa10f7f3a4122c68877e
2018-09-30 23:15:42 -07:00
Lorenzo Colitti
5bc5203d68 Merge "Make requestRouteToHost a no-op for system callers."
am: a52ba6ba12

Change-Id: I37ba2ef7ee7d052ec47c2d314f165315a13b06ac
2018-09-30 23:00:08 -07:00
Treehugger Robot
a52ba6ba12 Merge "Make requestRouteToHost a no-op for system callers." 2018-10-01 05:36:28 +00:00
Lorenzo Colitti
104c773343 Remove spurious WTF in rematching networks.
By construction, this WTF should never happen, since it's in an
if (nri.request.isRequest()) and by definition requests can only
be satisfied by one network at a time.

I don't think we've ever seen this particular WTF in an APR
report, which suggests that it's not happening in practice.

Test: atest FrameworksNetTests CtsNetTestCasesLegacyApi22 CtsNetTestCasesLegacyPermission22 android.net.cts.ConnectivityManagerTest
Change-Id: Icf4c7d2bb1da3c7db695cf0bcebc5806190a1677
2018-10-01 13:28:21 +09:00
Luke Huang
76b3296426 Merge "Rename object mNetd to mNetworkManagementService" am: 11453f8161
am: 27d722edc4

Change-Id: I1fcfcfb8828bf9b6206ddadede25d5e27b3c2908
2018-09-30 20:28:15 -07:00
Luke Huang
27d722edc4 Merge "Rename object mNetd to mNetworkManagementService"
am: 11453f8161

Change-Id: I658ba32a2396c393f3126b713d94ba809338d5e4
2018-09-30 20:16:41 -07:00
Luke Huang
358aa2652d ConnectivityService get INetd directly.
This is the first step for ConnectivityService
call into INetd directly.
Import INetd and get it by using NetdService.

Test: runtest frameworks-net passes
Test: manual testing of wakeupAdd/DelInterface works
Change-Id: I643dba5206c66958134152d062f3f3a19a34cf2c
2018-10-01 11:10:54 +08:00
Chiachang Wang
af85296ffc Merge "Fix idle timer rule leakage" am: 44f3896c39
am: d7a4444a6c

Change-Id: I51ab9c7e58853ab93b09f1ca9e0c461134157c7d
2018-09-30 20:10:04 -07:00
Lorenzo Colitti
62f752c2ce 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
2018-10-01 12:05:42 +09:00
Luke Huang
11453f8161 Merge "Rename object mNetd to mNetworkManagementService" 2018-10-01 03:01:33 +00:00
Chiachang Wang
d7a4444a6c Merge "Fix idle timer rule leakage"
am: 44f3896c39

Change-Id: I5ac912d121d094b36d46ccca385d5cf319fcb945
2018-09-30 19:57:18 -07:00
Chiachang Wang
44f3896c39 Merge "Fix idle timer rule leakage" 2018-10-01 02:20:23 +00:00
Chiachang Wang
228b1c34ed 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
2018-09-28 22:42:48 +08:00
Remi NGUYEN VAN
b36630f772 Merge "Call clearSettingsProvider before and after test" am: 3868fc30ee
am: 41779ee81b

Change-Id: I21123baaa211d19af181c970b7ad85051c7d08b7
2018-09-28 07:40:45 -07:00
Remi NGUYEN VAN
41779ee81b Merge "Call clearSettingsProvider before and after test"
am: 3868fc30ee

Change-Id: I38cae25353df48851280490d4593e70b49f0e6c0
2018-09-28 07:28:31 -07:00
Luke Huang
84e73baf3c Rename object mNetd to mNetworkManagementService
No functionality change

Test: runtest frameworks-net passes
Change-Id: Ic3977eed9a86deb76ef0e4e12ffa17597bdecc30
2018-09-28 13:47:13 +08:00
Remi NGUYEN VAN
ce9215b447 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
2018-09-28 14:46:34 +09:00
Jeffrey Vander Stoep
01baa06afe Merge "Add ConnectivityManager.getConnectionOwnerUid()" am: f8529dc891
am: 0c334f2581

Change-Id: I4ec4b9a8954deec001841566e0722caa1a3fa248
2018-09-21 14:48:32 -07:00
Jeffrey Vander Stoep
0c334f2581 Merge "Add ConnectivityManager.getConnectionOwnerUid()"
am: f8529dc891

Change-Id: Ib575a2a03c332d0143ed15652cc9c08c9cff694f
2018-09-21 14:26:19 -07:00
Jeff Vander Stoep
e7205d6853 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
2018-09-21 06:16:09 +00:00
Shaotang Li
830deda9d0 Merge changes into stage-aosp-master
am: 42367b7fb9

Change-Id: I46d9e80464652ac98c7b745686aaa490d57a8ab0
2018-09-13 00:56:38 -07:00
Shaotang Li
8d9c87dd69 Merge changes into stage-aosp-master
am: 771d829443

Change-Id: I6fa8268060713303c3d999fec0fd91aa78849872
2018-09-13 00:52:20 -07:00
Android Build Merger (Role)
42367b7fb9 Merge changes into stage-aosp-master 2018-09-13 07:27:15 +00:00
Android Build Merger (Role)
771d829443 Merge changes into stage-aosp-master 2018-09-13 07:27:15 +00:00
Benedict Wong
772d488fc8 Merge "Use UID as requestID" am: d173d03cbb
am: c48d763dfd

Change-Id: I0d9fb770482e72f3b017702ffb7ec144a64462e0
2018-09-12 15:22:39 -07:00
Benedict Wong
c48d763dfd Merge "Use UID as requestID"
am: d173d03cbb

Change-Id: Icef3693f5911c8f69076e0990392e28c693cbc22
2018-09-12 14:35:27 -07:00
Benedict Wong
d173d03cbb Merge "Use UID as requestID" 2018-09-12 18:51:33 +00:00
Andreas Gampe
3deed549c4 Merge changes into stage-aosp-master
am: 729da5e7fb

Change-Id: If60b6361f323c651510900344d75ce5fa7db17c3
2018-09-10 16:01:58 -07:00
Andreas Gampe
9d4b89039a Merge changes into stage-aosp-master
am: 92c173ee56

Change-Id: I4e707c0172a858db97d903ad79dadb37c7a910a7
2018-09-10 15:58:08 -07:00
Android Build Merger (Role)
729da5e7fb Merge changes into stage-aosp-master 2018-09-10 22:43:03 +00:00
Android Build Merger (Role)
92c173ee56 Merge changes into stage-aosp-master 2018-09-10 22:43:03 +00:00