Commit Graph

5305 Commits

Author SHA1 Message Date
Yan Yan
bd9217ff0c Merge changes I10c01f2b,Ie05bc535 am: c182d29130 am: bd45a0d77f
am: 8210690538

Change-Id: I074056f861332835adaed32ad7d43ed36667ffa3
2018-10-05 12:35:56 -07:00
Igor Murashkin
711df34d7b Merge changes into stage-aosp-master am: 57ff7edf69
am: 384127ccfe

Change-Id: I89aab101881f2b1d835c8c8814336e714fa9ab17
2018-10-05 12:17:40 -07:00
Yan Yan
8210690538 Merge changes I10c01f2b,Ie05bc535 am: c182d29130
am: bd45a0d77f

Change-Id: I5501ba7eb04493b5de84feaeadb53b57de89e8d2
2018-10-05 12:13:20 -07:00
Igor Murashkin
0d8926285b Merge changes into stage-aosp-master am: 526ef90850
am: 7240b9200f

Change-Id: Ib857b990a0938889b134228d78a32398a72be102
2018-10-05 12:12:17 -07:00
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
Yan Yan
bd45a0d77f Merge changes I10c01f2b,Ie05bc535
am: c182d29130

Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
2018-10-05 11:47:12 -07:00
Yan Yan
c182d29130 Merge changes I10c01f2b,Ie05bc535
* changes:
  Check to ensure UDP-encap is used only for IPv4
  Add UDP encapsulation tests for IpSecService.
2018-10-05 17:38:41 +00: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
330e1850b6 Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f am: c75b9031f5
am: a81b647e09

Change-Id: I593f1987170b279d57e8d18c380c1f16855f9206
2018-10-05 02:45:09 -07: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
760462a608 [automerger skipped] resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp
am: 78ca1bea52  -s ours

Change-Id: I931d622cb2c92d071ba198697a56f9413d9c5dec
2018-10-04 16:48:24 -07: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
evitayan
ceee5f8436 Check to ensure UDP-encap is used only for IPv4
This commit checks if UDP-encapsulation is used
for unsupported address family and throws
IllegalArgumentException when it happens.

Bug: 74213459
Test: Tests added in testCreateTransportModeTransformWithEncap
      and testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: I10c01f2bad6aca23430849ea9ef6c1eb157ae131
2018-10-04 11:44:00 -07: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
Andrew Solovay
0bce41a819 cherry-pick from pi-dev 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.

(Other files were not in the public Javadocs.)

Bug: 111925950
Test: make ds-docs
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Original Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 18:17:05 +00:00
evitayan
28abcaae90 Add UDP encapsulation tests for IpSecService.
This commit adds tests to ensure that IpSecService properly
handles UDP-encapsulation transforms correctly.

Bug: 76110065
Test: Added: testCreateTransportModeTransformWithEncap,
             testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: Ie05bc5354266806c2d03b0b3d73a4696a89eccf2
2018-10-04 10:37:47 -07:00
Leif Hendrik Wilden
bc1aa1cee5 Merge "Allow wifi and ethenet connected at same time." am: f0283ddd40 am: 978695ee48
am: d4ff3bd58f

Change-Id: I36b924ac20ebe58dc2a522509b83a341994ff480
2018-10-02 11:25:36 -07: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
94282cc0db Merge "ConnectivityService get INetd directly." am: d7e5a17900 am: df49789837
am: 6894baf23e

Change-Id: Ic1957ff9d4506b6c40bf7e4adcfd556b178871ba
2018-10-01 03:40:10 -07:00
Lorenzo Colitti
281cd5c3a3 Merge "Merge "Remove spurious WTF in rematching networks." am: 5f2851ff02 am: 8d7b056325" into pi-dev-plus-aosp
am: 8f6539069d

Change-Id: I9a2ba5d9104756cc34b01f5327e5bb72705691ac
2018-10-01 03:33:13 -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
Lorenzo Colitti
bd2ac7f7c6 Merge "Make requestRouteToHost a no-op for system callers." am: a52ba6ba12 am: 5bc5203d68
am: 4e2dc58c78

Change-Id: I2999208487c2c15d7e158e690cf7a2ac4e7c3e6d
2018-09-30 23:47:25 -07: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
d8da8f6079 Merge "Rename object mNetd to mNetworkManagementService" am: 11453f8161 am: 27d722edc4
am: 76b3296426

Change-Id: I34fbea64c15ccd96772d2aab7d23762c6d7f74ac
2018-09-30 20:37:45 -07: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
Chiachang Wang
ad3beebb02 Merge "Fix idle timer rule leakage" am: 44f3896c39 am: d7a4444a6c
am: af85296ffc

Change-Id: If0a281e2d8457eebaa2e572f70ef881f6e8fdb94
2018-09-30 20:20:17 -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
TreeHugger Robot
e432fc8be1 Merge "Call clearSettingsProvider before and after test" 2018-09-28 18:29:14 +00:00
Remi NGUYEN VAN
8c18fce186 Merge "Call clearSettingsProvider before and after test" am: 3868fc30ee am: 41779ee81b
am: b36630f772

Change-Id: I42487bdadc12fad135ac65dce0dfd6f77a9b9365
2018-09-28 07:53:08 -07:00