Remi NGUYEN VAN
f2c71e5a8d
Merge "Add SystemApi for captive portal metrics"
2019-01-30 15:19:07 +00:00
Remi NGUYEN VAN
fb43a914d3
Add SystemApi for captive portal metrics
...
The metrics go through NetworkMonitor in the NetworkStack so that they
can be upgraded to new metrics in the future.
Test: flashed, captive portal login works, metrics shown in events log
Bug: 112869080
Merged-In: I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8
Change-Id: Ib5e2126788f8d56a00a56d7efcd33c5f9a37a6de
2019-01-30 22:54:27 +09:00
Remi NGUYEN VAN
6bd9193a3d
Add SystemApi for captive portal metrics
...
The metrics go through NetworkMonitor in the NetworkStack so that they
can be upgraded to new metrics in the future.
Test: flashed, captive portal login works, metrics shown in events log
Bug: 112869080
(Cherry-pick of aosp/890004)
Change-Id: I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8
2019-01-30 22:01:20 +09:00
Chalard Jean
768ea1206d
Tell the factory it is already serving a request.
...
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.
Gives each factory a serial number and propogates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.
Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.
This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.
Bug: 18637384
Bug: 29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e
2019-01-30 15:41:57 +09:00
Remi NGUYEN VAN
f71c4dfb77
Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c am: 19542eea9e
...
am: b7829c8fec
Change-Id: I2059d9cfa3015388301a74828255354b6dc23c23
2019-01-29 21:42:29 -08:00
Remi NGUYEN VAN
b7829c8fec
Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c
...
am: 19542eea9e
Change-Id: I488fc028b8fd2aa5a09464082c65a4889a8a6b62
2019-01-29 21:27:50 -08:00
Remi NGUYEN VAN
6e82be4e4a
Remove last NetworkStack usage of hidden APIs
...
Includes various small changes to stop using hidden APIs
Test: make NetworkStack
Test: flashed, booted, WiFi and tethering working
Bug: 112869080
Change-Id: Id2830795a444f484b377ed6437435a1cd833697a
2019-01-30 10:23:24 +09:00
Remi NGUYEN VAN
d67edd1540
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe am: 5896eb1b1a
...
am: 03fe002386
Change-Id: Ib755bbfc5bb6bff4ada3995b70dfe8fc2d40b4f9
2019-01-29 03:39:27 -08:00
Remi NGUYEN VAN
03fe002386
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
...
am: 5896eb1b1a
Change-Id: I978bdb626c1f4c8bbe736c8bad1c74fb6a67b4b5
2019-01-29 03:29:01 -08:00
Remi NGUYEN VAN
c7fe99fdbe
Add NetworkUtils utilities to SystemApi
...
attach*Filter and addArpEntry are necessary for the NetworkStack but are
only usable for apps that have system permissions.
Also includes system API for IpPrefix, LinkAddress, LinkProperties,
Network, and static modifier in ApfCapabilities that were missed in
previous CLs.
Test: Builds, flashed, WiFi works
Bug: 112869080
Change-Id: If141ae6a2f9145f5af64ba002ca44938f39b90a9
2019-01-29 17:30:26 +09:00
Remi NGUYEN VAN
bb818c790f
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e am: e90dc24b2c
...
am: d3e5405831
Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85
2019-01-28 23:47:36 -08:00
Remi NGUYEN VAN
d3e5405831
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e
...
am: e90dc24b2c
Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9
2019-01-28 22:57:39 -08:00
Pavel Grafov
0d31afb2a0
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c am: f6c5ef95d1
...
am: e4dab6797f
Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925
2019-01-28 22:13:24 -08:00
Pavel Grafov
e4dab6797f
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c
...
am: f6c5ef95d1
Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3
2019-01-28 21:34:03 -08:00
Remi NGUYEN VAN
37053eb78e
Merge "Add SocketUtils for NetworkStack"
2019-01-28 23:14:08 +00:00
Pavel Grafov
76e3e0052c
Merge "Whitelist packages from VPN lockdown."
2019-01-28 20:15:49 +00:00
Remi NGUYEN VAN
a628730d0a
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
8d31333b7d
Merge "Move NetworkUtils used by NetworkStack" am: 8f8deae60f
...
am: 249646cc60
Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc
2019-01-28 01:30:17 -08:00
Remi NGUYEN VAN
8f8deae60f
Merge "Move NetworkUtils used by NetworkStack"
2019-01-28 09:06:20 +00:00
Remi NGUYEN VAN
d08b6d2105
Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259
...
am: 5fb799d7ee
Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36
2019-01-28 00:35:46 -08:00
Remi NGUYEN VAN
b19997dbe9
Merge "Move NetworkUtils used by NetworkStack"
2019-01-28 06:57:25 +00:00
Remi NGUYEN VAN
98d9df7a9b
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
e167e117c1
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
8bd18cff9a
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
1e67080e20
Merge "Add NetworkStack networking deps to SystemApi"
2019-01-28 02:58:01 +00:00
Pavel Grafov
3aeb3f3455
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
Remi NGUYEN VAN
b432c2c45c
Add NetworkStack networking deps to SystemApi
...
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce
2019-01-25 09:05:58 +09:00
Dan Albert
dfaba10dba
resolve merge conflicts of 511c26364f 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
511c26364f
Merge "Revert "Whitelist packages from VPN lockdown."" am: 7e81ae73b4
...
am: 8840cbd3fa
Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
2019-01-24 13:58:15 -08:00
Dan Albert
7e81ae73b4
Merge "Revert "Whitelist packages from VPN lockdown.""
2019-01-24 21:08:46 +00:00
Dan Albert
45f1a24661
Revert "Whitelist packages from VPN lockdown."
...
This reverts commit f1a610a1c2 .
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
2019-01-24 21:05:39 +00:00
Irina Dumitrescu
d44785fc13
Merge "Add API for proxy configuration over VPN." am: b11e29d4b3
...
am: 83662532c8
Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46
2019-01-24 10:20:32 -08:00
Pavel Grafov
bb4dff941d
Merge "Whitelist packages from VPN lockdown." am: bec7854508
...
am: 4934a54f2e
Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
2019-01-24 10:06:37 -08:00
Treehugger Robot
b11e29d4b3
Merge "Add API for proxy configuration over VPN."
2019-01-24 17:52:22 +00:00
Pavel Grafov
bec7854508
Merge "Whitelist packages from VPN lockdown."
2019-01-24 17:34:55 +00:00
Pavel Grafov
f1a610a1c2
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
affdbb9b26
Merge "Whitelist packages from VPN lockdown."
2019-01-24 16:15:08 +00:00
Irina Dumitrescu
de132bb6d6
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
f2cef662ec
Merge "Add API for proxy configuration over VPN."
2019-01-24 15:09:18 +00:00
Irina Dumitrescu
8767f41688
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
58e8be00ee
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
a0beaeb29a
Merge "Add additional SystemApi for NetworkStack" am: 24f1f0be3c
...
am: 61c2962d74
Change-Id: I5bdc50e7886731f61222bd1edd33765941118175
2019-01-24 02:17:38 -08:00
Remi NGUYEN VAN
24f1f0be3c
Merge "Add additional SystemApi for NetworkStack"
2019-01-24 09:55:01 +00:00
Remi NGUYEN VAN
3d05670a44
Merge "Add additional SystemApi for NetworkStack"
2019-01-24 07:37:52 +00:00
Junyu Lai
d412f97c5d
Merge changes from topic "ka05" am: 455df13823 am: 81a501ea8d
...
am: 3f899a7fdb
Change-Id: Ie56c431a6d934c752d1de30fc4bf98a7e557e5b2
2019-01-23 22:24:41 -08:00
Junyu Lai
3f899a7fdb
Merge changes from topic "ka05" am: 455df13823
...
am: 81a501ea8d
Change-Id: I08979872a03c52e933daa39730fd71e998272613
2019-01-23 21:44:11 -08:00
Junyu Lai
455df13823
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
db42444fc0
Merge changes I1250730c,I7d00848c am: 4bcdcfebd4 am: 3bf01b0fbe
...
am: 2a929123b3
Change-Id: Icc938491a9c4474cc27a4376ef03c954aac461b3
2019-01-23 09:01:09 -08:00
Remi NGUYEN VAN
2a929123b3
Merge changes I1250730c,I7d00848c am: 4bcdcfebd4
...
am: 3bf01b0fbe
Change-Id: I31c9f6c11d0f52a34f68151fc2baca1921dcadad
2019-01-23 08:40:50 -08:00
junyulai
d05a192fbe
[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