Commit Graph

5888 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
37df1b7b95 Merge "Add SystemApi for captive portal metrics" 2019-01-30 15:19:07 +00:00
Remi NGUYEN VAN
d66669edc9 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
7265562175 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
7a45071808 Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c am: 0adf9260fc
am: 6d834433ac

Change-Id: I2059d9cfa3015388301a74828255354b6dc23c23
2019-01-29 21:42:29 -08:00
Remi NGUYEN VAN
6d834433ac Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c
am: 0adf9260fc

Change-Id: I488fc028b8fd2aa5a09464082c65a4889a8a6b62
2019-01-29 21:27:50 -08:00
Remi NGUYEN VAN
0adf9260fc Merge "Remove last NetworkStack usage of hidden APIs"
am: 16ec5d038c

Change-Id: I27c78d09938f672a4428a17436d5ed0541170d0d
2019-01-29 21:13:46 -08:00
Remi NGUYEN VAN
9e7e213995 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
5dc4775510 Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe am: 48af15ae8b
am: db8b553287

Change-Id: Ib755bbfc5bb6bff4ada3995b70dfe8fc2d40b4f9
2019-01-29 03:39:27 -08:00
Remi NGUYEN VAN
db8b553287 Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
am: 48af15ae8b

Change-Id: I978bdb626c1f4c8bbe736c8bad1c74fb6a67b4b5
2019-01-29 03:29:01 -08:00
Remi NGUYEN VAN
48af15ae8b Merge "Add NetworkUtils utilities to SystemApi"
am: 9cc31061fe

Change-Id: I82f20718d86b08cd0916ee33300ca0ee734305a6
2019-01-29 03:17:41 -08:00
Remi NGUYEN VAN
a5225eaf51 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
287ce3d267 Merge "Add SocketUtils for NetworkStack" am: 75546d4e9d am: 68a0c1de33
am: dae2e37ce0

Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85
2019-01-28 23:47:36 -08:00
Remi NGUYEN VAN
dae2e37ce0 Merge "Add SocketUtils for NetworkStack" am: 75546d4e9d
am: 68a0c1de33

Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9
2019-01-28 22:57:39 -08:00
Pavel Grafov
45e14f9576 Merge "Whitelist packages from VPN lockdown." am: 2c13733fac am: 4513467368
am: a9c8b8a489

Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925
2019-01-28 22:13:24 -08:00
Pavel Grafov
a9c8b8a489 Merge "Whitelist packages from VPN lockdown." am: 2c13733fac
am: 4513467368

Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3
2019-01-28 21:34:03 -08:00
Remi NGUYEN VAN
68a0c1de33 Merge "Add SocketUtils for NetworkStack"
am: 75546d4e9d

Change-Id: I0db40afbf2de55d77d9d5493e556f499d2383f59
2019-01-28 21:19:36 -08:00
Pavel Grafov
4513467368 Merge "Whitelist packages from VPN lockdown."
am: 2c13733fac

Change-Id: I3332e495ba0c903dff3dbb9c53c5c4784ea519f4
2019-01-28 20:18:23 -08:00
Remi NGUYEN VAN
75546d4e9d Merge "Add SocketUtils for NetworkStack" 2019-01-28 23:14:08 +00:00
Pavel Grafov
2c13733fac Merge "Whitelist packages from VPN lockdown." 2019-01-28 20:15:49 +00:00
Remi NGUYEN VAN
6f08bb23a1 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
c6e8b353f0 [automerger skipped] Merge "Move NetworkUtils used by NetworkStack" am: 1ee45c9bfb am: 1e69c8baca
am: 93bbacda97 -s ours
am skip reason: change_id Ie20dcee375b377236004a7689890729493aca857 with SHA1 4427014710 is in history

Change-Id: I5ea53ddf91c48d0700fe37318647b1e1fa26de23
2019-01-28 01:47:49 -08:00
Remi NGUYEN VAN
93bbacda97 Merge "Move NetworkUtils used by NetworkStack" am: 1ee45c9bfb
am: 1e69c8baca

Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc
2019-01-28 01:30:17 -08:00
Remi NGUYEN VAN
1e69c8baca Merge "Move NetworkUtils used by NetworkStack"
am: 1ee45c9bfb

Change-Id: Ib83c3cb8ced0d226bd57375cd4600665d72fd962
2019-01-28 01:21:01 -08:00
Remi NGUYEN VAN
1ee45c9bfb Merge "Move NetworkUtils used by NetworkStack" 2019-01-28 09:06:20 +00:00
Remi NGUYEN VAN
e865ba3e9f [automerger skipped] Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259 am: 05ec4875a0
am: f554e1392c -s ours
am skip reason: change_id Id59dc06fb85e4ac88098f56b621ec880610759ce with SHA1 ae98229898 is in history

Change-Id: I8e2ed91ef75e3a2f855b2b3549c0db5e1511ca5e
2019-01-28 00:44:06 -08:00
Remi NGUYEN VAN
f554e1392c Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259
am: 05ec4875a0

Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36
2019-01-28 00:35:46 -08:00
Remi NGUYEN VAN
05ec4875a0 Merge "Add NetworkStack networking deps to SystemApi"
am: 9188b49259

Change-Id: Id8b31f100ab07ca9a38f4cff26c719dd9d74bc54
2019-01-28 00:26:39 -08:00
Remi NGUYEN VAN
fd36bc7e74 Merge "Move NetworkUtils used by NetworkStack" 2019-01-28 06:57:25 +00:00
Remi NGUYEN VAN
4427014710 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
926e230392 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
d57b49cb4b 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
29d41a316d Merge "Add NetworkStack networking deps to SystemApi" 2019-01-28 02:58:01 +00:00
Pavel Grafov
4753f40339 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
ae98229898 Add NetworkStack networking deps to SystemApi
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce
2019-01-25 09:05:58 +09:00
Dan Albert
61bb568007 resolve merge conflicts of d7f2320945 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
d7f2320945 Merge "Revert "Whitelist packages from VPN lockdown."" am: 0246fc7f38
am: 3ffcc2d808

Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
2019-01-24 13:58:15 -08:00
Dan Albert
3ffcc2d808 Merge "Revert "Whitelist packages from VPN lockdown.""
am: 0246fc7f38

Change-Id: Ibaf799dc2664a6b3b743030da956679a3414ad9d
2019-01-24 13:45:19 -08:00
Dan Albert
0246fc7f38 Merge "Revert "Whitelist packages from VPN lockdown."" 2019-01-24 21:08:46 +00:00
Dan Albert
bc9dd2b1aa Revert "Whitelist packages from VPN lockdown."
This reverts commit b66ec9bbf7.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
2019-01-24 21:05:39 +00:00
Irina Dumitrescu
a3a46d342b [automerger skipped] Merge "Add API for proxy configuration over VPN." am: a72ef3ff55 am: 6ff618c944
am: 6cbfaa5bb4 -s ours
am skip reason: change_id Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a with SHA1 3a83884883 is in history

Change-Id: I1b5f49892d2ff473b5fe7d3d1e71e3cd3ffaca26
2019-01-24 11:14:25 -08:00
Pavel Grafov
532c1974a5 [automerger skipped] Merge "Whitelist packages from VPN lockdown." am: 5bc0c4f1ca am: abc3e7bd1f
am: cd5753de76 -s ours
am skip reason: change_id I7f6c5b9172063b588feacd6b9930a6cb88f764ab with SHA1 a2f5288aed is in history

Change-Id: I56f2eadd2e95a74897d7e17cb21d672e747b8261
2019-01-24 11:00:58 -08:00
Irina Dumitrescu
6cbfaa5bb4 Merge "Add API for proxy configuration over VPN." am: a72ef3ff55
am: 6ff618c944

Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46
2019-01-24 10:20:32 -08:00
Irina Dumitrescu
6ff618c944 Merge "Add API for proxy configuration over VPN."
am: a72ef3ff55

Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd
2019-01-24 10:08:07 -08:00
Pavel Grafov
cd5753de76 Merge "Whitelist packages from VPN lockdown." am: 5bc0c4f1ca
am: abc3e7bd1f

Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
2019-01-24 10:06:37 -08:00
Treehugger Robot
a72ef3ff55 Merge "Add API for proxy configuration over VPN." 2019-01-24 17:52:22 +00:00
Pavel Grafov
abc3e7bd1f Merge "Whitelist packages from VPN lockdown."
am: 5bc0c4f1ca

Change-Id: I329e24f1359a11a72ae9d0a23d2dc5b5de5aa8a7
2019-01-24 09:49:42 -08:00
Pavel Grafov
5bc0c4f1ca Merge "Whitelist packages from VPN lockdown." 2019-01-24 17:34:55 +00:00
Pavel Grafov
b66ec9bbf7 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
a7789bb2f0 Merge "Whitelist packages from VPN lockdown." 2019-01-24 16:15:08 +00:00
Irina Dumitrescu
0eafa0b5c8 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