Commit Graph

10496 Commits

Author SHA1 Message Date
Automerger Merge Worker
928e591d99 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 -s ours am: a8e2c32155 -s ours" into rvc-d1-dev-plus-aosp am: d021dfc531 -s ours am: f31dd5a388 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I8b46c9a2f8a885004c49e7bbcffc96b9ce4d5a8b
2020-05-13 01:32:14 +00:00
Automerger Merge Worker
29a6ca9e2c Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 am: be7c169c70 -s ours" into rvc-qpr-dev-plus-aosp am: 91de7b2509 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I4ec346e2fb8a28edbf9e2fe73990db0e39bae6b5
2020-05-13 01:28:54 +00:00
Remi NGUYEN VAN
5eb0ecdef4 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 -s ours am: c559d0b71b -s ours am: 42af32210b -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: If5949be348bcd5a052e4d0ad23fe1bcf63b246a3
2020-05-13 01:28:15 +00:00
Automerger Merge Worker
f31dd5a388 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 -s ours am: a8e2c32155 -s ours" into rvc-d1-dev-plus-aosp am: d021dfc531 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I881e4b6f0789df7fce7ce4ab1242bfda457a1b38
2020-05-13 01:17:32 +00:00
Automerger Merge Worker
91de7b2509 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 am: be7c169c70 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-13 01:15:39 +00:00
Remi NGUYEN VAN
a1e83f648b [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 am: be7c169c70 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: I18ffb2265247f2cd600e994cb18d9a085c30f764
2020-05-13 01:15:25 +00:00
Remi NGUYEN VAN
42af32210b [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 -s ours am: c559d0b71b -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: Id509afa23991606511134bb7d10f8cd2152add0d
2020-05-13 01:15:18 +00:00
Remi NGUYEN VAN
5c079bddd1 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 -s ours am: a8e2c32155 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I9b7431c4fd6dd21511222a3e71c07eb17265f1cf
2020-05-13 01:02:21 +00:00
Remi NGUYEN VAN
c559d0b71b [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: I57fe5219d620fd5935837db054954ccb8e73c36b
2020-05-13 01:01:20 +00:00
Remi NGUYEN VAN
a8e2c32155 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: Ic5d0d8461cbaf0a75da92b47d2d0aaa7a7743fb6
2020-05-13 00:48:39 +00:00
Remi NGUYEN VAN
97453866a6 Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692
Change-Id: I2ec432881b77f0b093fc4ced18fe775a91ae93d3
2020-05-13 00:48:30 +00:00
Remi NGUYEN VAN
4c0ddfa692 Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev 2020-05-13 00:34:41 +00:00
Automerger Merge Worker
1e651c683a Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: d4cd49c306 -s ours" into rvc-d1-dev-plus-aosp am: 0d34274a6b -s ours am: 8a89c6f942 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 ad72d21a53 is in history

Change-Id: I64a603abfab86adf99ee30417e1b11566f1b563a
2020-05-12 22:36:51 +00:00
Automerger Merge Worker
7c15974482 [automerger skipped] Merge changes from topic "am-a4c996e50cb34a3bb257f059536b77ae" into rvc-d1-dev-plus-aosp am: 5f93a08607 -s ours am: 09d264f306 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: Id6a067912a46cbed8201da3a9057d183017740d3
2020-05-12 22:32:41 +00:00
Automerger Merge Worker
8a89c6f942 Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: d4cd49c306 -s ours" into rvc-d1-dev-plus-aosp am: 0d34274a6b -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 ad72d21a53 is in history

Change-Id: Ie3884e88a5e1b7e8997da346c7984a6bf02b186f
2020-05-12 21:04:43 +00:00
Automerger Merge Worker
09d264f306 [automerger skipped] Merge changes from topic "am-a4c996e50cb34a3bb257f059536b77ae" into rvc-d1-dev-plus-aosp am: 5f93a08607 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: I0ea68069cd9e07bf2d95b14452046fdb63613782
2020-05-12 21:03:36 +00:00
Automerger Merge Worker
0d34274a6b Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: d4cd49c306 -s ours" into rvc-d1-dev-plus-aosp 2020-05-12 20:47:07 +00:00
TreeHugger Robot
865f09679a [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: d4cd49c306 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: I439913a4195cea16832b3ec6c19a3cfaa63dfdb8
2020-05-12 20:47:02 +00:00
TreeHugger Robot
69b2c644c6 [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 am: e9c51564aa -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: Ib9aaf9091937ae27f35a389cc3de696567cefe1b
2020-05-12 20:46:55 +00:00
Benedict Wong
c9900c03c2 [automerger skipped] Use TransformRecord to get SPI instead of SpiRecord am: c6cdcbfa83 am: a4d2cac578 -s ours
am skip reason: Change-Id I1959f3080946267243564459ff4207647922566e with SHA-1 1425cf5655 is in history

Change-Id: Id31a417c7a4204bd646400e90456424d12d2d9d0
2020-05-12 20:46:52 +00:00
TreeHugger Robot
e9c51564aa Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70
Change-Id: Ie0c5a3c7bfc16edf98203212b8a1e7e4e8b302b9
2020-05-12 20:45:01 +00:00
Benedict Wong
a4d2cac578 Use TransformRecord to get SPI instead of SpiRecord am: c6cdcbfa83
Change-Id: I011543293623240b5652ac9818b0b3f28a397e97
2020-05-12 20:44:59 +00:00
TreeHugger Robot
d4cd49c306 [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: I0b5556bcaa27ca0a379f910bfba80aec506348c9
2020-05-12 20:41:03 +00:00
Automerger Merge Worker
32bc4185a4 Merge "Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44 am: 1d81e3c69e" into rvc-dev-plus-aosp am: abd8340a70 am: a1424e18bc am: 29638bc032
Change-Id: I287a77da7cfc176a4f159318d8847ba65c093da4
2020-05-12 18:48:04 +00:00
Cody Kesting
5e6cc3187b Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb am: e4e48c22c5 am: 51edeeeb65 am: 88d1b83af6 am: e0336ca4d6
Change-Id: I4925d5a7f9c4dd063e87b138806a7b562a7390e4
2020-05-12 18:47:10 +00:00
Automerger Merge Worker
29638bc032 Merge "Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44 am: 1d81e3c69e" into rvc-dev-plus-aosp am: abd8340a70 am: a1424e18bc
Change-Id: I17ddf91a95c9f1e73fbbd0fac62851d139732be1
2020-05-12 18:25:39 +00:00
Cody Kesting
e0336ca4d6 Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb am: e4e48c22c5 am: 51edeeeb65 am: 88d1b83af6
Change-Id: I4e3b94372ad788ecefe270d6ca18b611b3463bf5
2020-05-12 18:24:54 +00:00
Automerger Merge Worker
a1424e18bc Merge "Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44 am: 1d81e3c69e" into rvc-dev-plus-aosp am: abd8340a70
Change-Id: I1860d59ed83e14337564d8db248fc5b0e6581120
2020-05-12 17:51:24 +00:00
Cody Kesting
88d1b83af6 Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb am: e4e48c22c5 am: 51edeeeb65
Change-Id: I0d467e1fd02995cf2fe4c3f41e0ea78d4f2be9e2
2020-05-12 17:50:24 +00:00
Cody Kesting
59827dcf92 Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44 am: 1d81e3c69e
Change-Id: I17839cd271d984f76c203889293cc51375bb8bcb
2020-05-12 17:27:09 +00:00
Cody Kesting
51edeeeb65 Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb am: e4e48c22c5
Change-Id: I7af702ff5eafbd0f5bb2247e0debf975e51accd1
2020-05-12 17:26:44 +00:00
Cody Kesting
1d81e3c69e Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44
Change-Id: Ie14ab9cbcf8f7b291fb88f4b4abedab1b5978c3e
2020-05-12 17:10:10 +00:00
Cody Kesting
e4e48c22c5 Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb
Change-Id: I3b1c29b30912c4dddc3524a9a28fb3ad8c3ac318
2020-05-12 17:09:14 +00:00
Cody Kesting
727f0d1d44 Merge "Create TestApi for simulating a Data Stall on ConnectivityService." 2020-05-12 16:52:35 +00:00
Cody Kesting
eb44b7b1bb Merge "Set owner and administrator UIDs for test networks." 2020-05-12 16:52:07 +00:00
Remi NGUYEN VAN
af7d219ada Merge "Send full LinkProperties to NetworkMonitor" am: 7d8b7603ab am: 16192b71ae am: 52fcc84889 am: 29dcdb4d05 am: 45a44afd6d
Change-Id: Ifdb9072c0bcb68ad7d2f8482f81b277f0d669d92
2020-05-12 09:38:32 +00:00
Remi NGUYEN VAN
45a44afd6d Merge "Send full LinkProperties to NetworkMonitor" am: 7d8b7603ab am: 16192b71ae am: 52fcc84889 am: 29dcdb4d05
Change-Id: I76892cd7739d2a72487f294c634967835848059d
2020-05-12 09:20:45 +00:00
Remi NGUYEN VAN
1b0c8e3945 Send full LinkProperties to NetworkMonitor
Set the parcelSensitiveFields bit when sending LinkProperties to
NetworkMonitor, so that the captive portal API URL is not lost.

Test: atest ConnectivityServiceIntegrationTest (see followup change)
Bug: 156062304
Original-Change: https://android-review.googlesource.com/1307833
Merged-In: Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550
Change-Id: Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550
2020-05-12 09:14:38 +00:00
Remi NGUYEN VAN
29dcdb4d05 Merge "Send full LinkProperties to NetworkMonitor" am: 7d8b7603ab am: 16192b71ae am: 52fcc84889
Change-Id: Ib9e859e427e737afe04d06482db5a50803822b6f
2020-05-12 09:05:40 +00:00
Remi NGUYEN VAN
52fcc84889 Merge "Send full LinkProperties to NetworkMonitor" am: 7d8b7603ab am: 16192b71ae
Change-Id: I7e81f65e4b8f22a646dba191748133841a569d44
2020-05-12 08:53:53 +00:00
Remi NGUYEN VAN
16192b71ae Merge "Send full LinkProperties to NetworkMonitor" am: 7d8b7603ab
Change-Id: Ib33f33a1998b61b980315e7278162e57f8f56cf2
2020-05-12 08:37:41 +00:00
Remi NGUYEN VAN
7d8b7603ab Merge "Send full LinkProperties to NetworkMonitor" 2020-05-12 08:13:05 +00:00
Chalard Jean
e854cdbf3d Merge "Fix a bug where VPNs start out suspended on cellular" am: bd3a7f994d am: cbb9c78350 am: 986a8a1b76 am: 57ba9149dc am: e857684f7d
Change-Id: I94536a7867592ea4c2823f6dcaad1ac4420a3230
2020-05-11 05:41:59 +00:00
Chalard Jean
e857684f7d Merge "Fix a bug where VPNs start out suspended on cellular" am: bd3a7f994d am: cbb9c78350 am: 986a8a1b76 am: 57ba9149dc
Change-Id: Ib63e5ce0f1e986c7d4bd4895e36a34ef94f62a57
2020-05-11 05:25:52 +00:00
Chalard Jean
57ba9149dc Merge "Fix a bug where VPNs start out suspended on cellular" am: bd3a7f994d am: cbb9c78350 am: 986a8a1b76
Change-Id: I7b21a5ba0e1d3bd15c8c1c0a33091955d67c5d86
2020-05-11 05:15:00 +00:00
Chalard Jean
986a8a1b76 Merge "Fix a bug where VPNs start out suspended on cellular" am: bd3a7f994d am: cbb9c78350
Change-Id: I368308ded731b221be7fae6ddf1723c587ae4d20
2020-05-11 04:59:35 +00:00
Chalard Jean
cbb9c78350 Merge "Fix a bug where VPNs start out suspended on cellular" am: bd3a7f994d
Change-Id: Ic28ed72f30d49da7bd137b4d4db125b895025ed0
2020-05-11 04:46:46 +00:00
Chalard Jean
91a1beddcc Fix a bug where VPNs start out suspended on cellular
As NetworkAgent is in a transition where all agents need
to include the NOT_SUSPENDED capability as part of their
migration to the system API, ConnectivityService adds it
forcefully to all agents that don't have the CELLULAR
transport. This doesn't include VPNs when VPNs have some
cellular network as their underlying network.

The best way to solve this is to make sure the VPN
capabilities reflect those of the underlying networks as
far as the NOT_SUSPENDED capability is concerned. This
is how they work for other similar capabilities.

This also happens to contain a drive-by fix for an issue
with a spurious capabilities callback is triggered when
a VPN connects and it has any underlying network (which
means almost always, because it will take the default
network if it doesn't declare any). Fixing this was
necessary to have a cogent test of this issue, but it
could be moved to another patch or it could stay unfixed
with some minor ajustment to the tests if judged too
dangerous to include in R at this point.

Test: New tests in this patch. Also manually tested with
      tcpdump as described in b/150570873.
Bug: 150570873
Change-Id: I3e4ff990c0d4825b21c7679be29a482a2d1324ec
2020-05-11 10:44:50 +09:00
Remi NGUYEN VAN
3b1d8b491d Send full LinkProperties to NetworkMonitor
Set the parcelSensitiveFields bit when sending LinkProperties to
NetworkMonitor, so that the captive portal API URL is not lost.

Test: atest ConnectivityServiceIntegrationTest (see followup change)
Bug: 156062304
Change-Id: Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550
2020-05-10 16:11:11 +09:00
Benedict Wong
ad72d21a53 Add tests for Tunnel, Transport mode application with released SPIs
This change adds tests to validate that both transport and tunnel mode
transforms continue to work even after the SPI resource has been
released. Specifically, since SPI resources are effectively subsumed by
the creation of a Transform, the SPI resource is still "alive", but
removed from the user-tracking sparse arrays.

Bug: 142072071
Test: Added these new tests. Failing prior to aosp/1133555, passes with.
Change-Id: I37dd459d08b57b14f72f3b28ea80fa231b152f10
Merged-In: I37dd459d08b57b14f72f3b28ea80fa231b152f10
(cherry picked from commit d06d390b20)
2020-05-08 00:01:59 -07:00