Remi NGUYEN VAN
5b8ef04f36
Merge "Add SocketUtils for NetworkStack" am: cec60fa56a am: 27ae908282
...
am: ca7c41f5fa
2019-01-28 23:47:36 -08:00
Remi NGUYEN VAN
ca7c41f5fa
Merge "Add SocketUtils for NetworkStack" am: cec60fa56a
...
am: 27ae908282
2019-01-28 22:57:39 -08:00
Pavel Grafov
1f47ab08c1
Merge "Whitelist packages from VPN lockdown." am: 774c3ce152 am: b478bb25ac
...
am: 2b996ad0dd
2019-01-28 22:13:24 -08:00
Pavel Grafov
2b996ad0dd
Merge "Whitelist packages from VPN lockdown." am: 774c3ce152
...
am: b478bb25ac
2019-01-28 21:34:03 -08:00
Remi NGUYEN VAN
cec60fa56a
Merge "Add SocketUtils for NetworkStack"
2019-01-28 23:14:08 +00:00
Pavel Grafov
774c3ce152
Merge "Whitelist packages from VPN lockdown."
2019-01-28 20:15:49 +00:00
Junyu Lai
f75556a089
Merge "Hide Keepalive offload API in IpSec"
2019-01-28 15:18:29 +00:00
Remi NGUYEN VAN
53b03140d4
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
2019-01-28 20:11:27 +09:00
Remi NGUYEN VAN
9a77141364
Merge "Move NetworkUtils used by NetworkStack" am: b8bbc48dee
...
am: 4c5b40e084
2019-01-28 01:30:17 -08:00
Remi NGUYEN VAN
b8bbc48dee
Merge "Move NetworkUtils used by NetworkStack"
2019-01-28 09:06:20 +00:00
Remi NGUYEN VAN
f6a3b910bb
Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259
...
am: bc7a8f14f4
2019-01-28 00:35:46 -08:00
Remi NGUYEN VAN
18f11cd4d7
Merge "Move NetworkUtils used by NetworkStack"
2019-01-28 06:57:25 +00:00
Remi NGUYEN VAN
77dd54d3d4
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
2019-01-28 13:45:46 +09:00
Remi NGUYEN VAN
e88516f13b
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
2019-01-28 13:45:17 +09:00
Remi NGUYEN VAN
a4bcc86dbe
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
2019-01-28 13:28:35 +09:00
Lorenzo Colitti
9b634f17a2
Merge "Add NetworkStack networking deps to SystemApi"
2019-01-28 02:58:01 +00:00
Pavel Grafov
a462bcb9c4
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc
2019-01-25 19:59:03 +00:00
junyulai
3a4675572d
Hide Keepalive offload API in IpSec
...
Since the new keepalive API is exported in ConnectivityManager,
hide Keepalive API in IpSec, also make system-current.txt sync
for this part.
Bug: 114151147
Test: m -j
Change-Id: I076030bdbab1cd7d69f6a034577d529970b050dc
2019-01-25 14:41:19 +08:00
Remi NGUYEN VAN
ca1820bf2f
Add NetworkStack networking deps to SystemApi
...
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce
2019-01-25 09:05:58 +09:00
Dan Albert
fe1cdd047f
resolve merge conflicts of fb54fde402 to master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7
2019-01-24 14:46:02 -08:00
Dan Albert
fb54fde402
Merge "Revert "Whitelist packages from VPN lockdown."" am: 9f73671651
...
am: 2f94ef95c4
2019-01-24 13:58:15 -08:00
Dan Albert
9f73671651
Merge "Revert "Whitelist packages from VPN lockdown.""
2019-01-24 21:08:46 +00:00
Dan Albert
ee8e6a0fae
Revert "Whitelist packages from VPN lockdown."
...
This reverts commit bb9cef04c5
2019-01-24 21:05:39 +00:00
Irina Dumitrescu
b866a5b6e6
Merge "Add API for proxy configuration over VPN." am: 8b5917965d
...
am: ac77629a1e
2019-01-24 10:20:32 -08:00
Pavel Grafov
52e0e403d2
Merge "Whitelist packages from VPN lockdown." am: efc773525c
...
am: 295016b22b
2019-01-24 10:06:37 -08:00
Treehugger Robot
8b5917965d
Merge "Add API for proxy configuration over VPN."
2019-01-24 17:52:22 +00:00
Pavel Grafov
efc773525c
Merge "Whitelist packages from VPN lockdown."
2019-01-24 17:34:55 +00:00
Pavel Grafov
bb9cef04c5
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Merged-In: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
2019-01-24 16:17:11 +00:00
Pavel Grafov
46165b5d61
Merge "Whitelist packages from VPN lockdown."
2019-01-24 16:15:08 +00:00
Irina Dumitrescu
044a436ac9
Add API for proxy configuration over VPN.
...
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Merged-In: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
2019-01-24 16:07:20 +00:00
TreeHugger Robot
06928f4422
Merge "Add API for proxy configuration over VPN."
2019-01-24 15:09:18 +00:00
Irina Dumitrescu
18622d3d35
Add API for proxy configuration over VPN.
...
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
2019-01-24 12:54:19 +00:00
Pavel Grafov
1d58621a1f
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
2019-01-24 11:34:17 +00:00
Remi NGUYEN VAN
60d32999db
Merge "Add additional SystemApi for NetworkStack" am: 2ffdcc26b0
...
am: aee43d2387
2019-01-24 02:17:38 -08:00
Remi NGUYEN VAN
2ffdcc26b0
Merge "Add additional SystemApi for NetworkStack"
2019-01-24 09:55:01 +00:00
Remi NGUYEN VAN
50d8a03855
Merge "Add additional SystemApi for NetworkStack"
2019-01-24 07:37:52 +00:00
Junyu Lai
0affe5dad2
Merge changes from topic "ka05" am: b3656c7b1b am: 14e51c8a84
...
am: 3dea854998
2019-01-23 22:24:41 -08:00
Junyu Lai
3dea854998
Merge changes from topic "ka05" am: b3656c7b1b
...
am: 14e51c8a84
2019-01-23 21:44:11 -08:00
Junyu Lai
b3656c7b1b
Merge changes from topic "ka05"
...
* changes:
[KA05] Export keepalive offload api for IpSec Nat-T file descriptor
[KA01] export SocketKeepalive API for NAT-T keepalive
2019-01-24 05:06:39 +00:00
Remi NGUYEN VAN
6ca2d0f4c1
Merge changes I1250730c,I7d00848c am: e693d49c0a am: 9026fb46cc
...
am: 9a13aa9ffd
2019-01-23 09:01:09 -08:00
Remi NGUYEN VAN
9a13aa9ffd
Merge changes I1250730c,I7d00848c am: e693d49c0a
...
am: 9026fb46cc
2019-01-23 08:40:50 -08:00
junyulai
215b877f11
[KA05] Export keepalive offload api for IpSec Nat-T file descriptor
...
Adds system api of createSocketKeepalive to take file descriptor,
so privileged apps could use it without the need of IpSecService.
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: If926c21704b6ed73a0adfcadad732b97b42bacae
2019-01-24 00:40:25 +08:00
Remi NGUYEN VAN
299a7cc196
Add additional SystemApi for NetworkStack
...
Members in this CL were missed in earlier changes.
Test: m
Bug: 112869080
Merged-In: I8b5b80ea7b267357eb0387d504a2f78358d6d502
Change-Id: I8b9b15f8b91962f3ef554fd222a825e471806c9e
2019-01-24 01:01:13 +09:00
Remi NGUYEN VAN
39fbb92bbb
Add additional SystemApi for NetworkStack
...
Members in this CL were missed in earlier changes.
Test: m
Bug: 112869080
Change-Id: I8b5b80ea7b267357eb0387d504a2f78358d6d502
2019-01-24 00:55:43 +09:00
junyulai
48eac1d4c8
[KA01] export SocketKeepalive API for NAT-T keepalive
...
The new set of API replace the PacketKeepalive system API
which is only specific for IPsec NAT-T keepalive packet. Allows
applications to request different types of keepalives through
the same set of API.
By using keepalives, applications could request system to
periodically send specific packets on their behalf, using
hardware offload to save battery power.
This change would only address interface change and test part of
original functionality. After all reference of PacketKeepalive
are removed, another change would be submitted to remove old
API.
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: I3367666810acc44d5ad20e19acd4bf936e8b5d9c
2019-01-23 23:17:17 +08:00
Remi NGUYEN VAN
e693d49c0a
Merge changes I1250730c,I7d00848c
...
* changes:
Create a wrapper for IpClient
Move IpClient to NetworkStack
2019-01-23 15:05:00 +00:00
Chalard Jean
dccea36b52
Merge "[MS11] Implement findL2Key" am: 773f3f5bf3 am: 21c8257178
...
am: f1c3019d42
2019-01-23 03:37:45 -08:00
Chalard Jean
f1c3019d42
Merge "[MS11] Implement findL2Key" am: 773f3f5bf3
...
am: 21c8257178
2019-01-23 03:24:20 -08:00
Treehugger Robot
773f3f5bf3
Merge "[MS11] Implement findL2Key"
2019-01-23 11:01:43 +00:00
Luke Huang
d121dd2aa5
Merge changes from topic "Java async dns" am: 31ff0616d1 am: a8e16262f1
...
am: e052154abb
2019-01-23 01:24:21 -08:00
