Commit Graph

5997 Commits

Author SHA1 Message Date
Varun Anand
6a84692245 Merge "Update VPN capabilities when its underlying network set is null." am: 9e226700d9 am: bd97fcd674
am: 8451d4709a

Change-Id: I6dd5a369f1a3b74bbf498051ef1e4d1b31bd8e5e
2019-02-15 04:11:55 -08:00
Varun Anand
8451d4709a Merge "Update VPN capabilities when its underlying network set is null." am: 9e226700d9
am: bd97fcd674

Change-Id: I832cbc4646c010add5a4f051d3f7151cfc94120c
2019-02-15 03:54:28 -08:00
Varun Anand
bd97fcd674 Merge "Update VPN capabilities when its underlying network set is null."
am: 9e226700d9

Change-Id: Id4560d201a40f5e1b1617819991da99d86379dbe
2019-02-15 03:45:03 -08:00
Treehugger Robot
9e226700d9 Merge "Update VPN capabilities when its underlying network set is null." 2019-02-15 11:33:27 +00:00
Remi NGUYEN VAN
c3d8806b3d [automerger skipped] Merge "Move NetworkStack to services.net" am: f66b7a8e60 am: 8989e36283
am: 266148b061 -s ours
am skip reason: change_id I501b125a388c1100c2182bde4670944c2f0d7a02 with SHA1 4e4f8da24b is in history

Change-Id: Iba45b354c8a6b690177a1bc9928ea87a5850515c
2019-02-15 03:19:33 -08:00
Remi NGUYEN VAN
266148b061 Merge "Move NetworkStack to services.net" am: f66b7a8e60
am: 8989e36283

Change-Id: I6a0ddc23bf95039d9d51a4fde9dd87d2f5bf71ee
2019-02-15 03:10:18 -08:00
Remi NGUYEN VAN
8989e36283 Merge "Move NetworkStack to services.net"
am: f66b7a8e60

Change-Id: Iab45985aedb8069ad50fd2913ef6e828989cdd0d
2019-02-15 03:01:11 -08:00
Remi NGUYEN VAN
f66b7a8e60 Merge "Move NetworkStack to services.net" 2019-02-15 10:52:03 +00:00
Remi NGUYEN VAN
01782c3da0 [automerger skipped] Merge "Remove NetworkMonitor dependency on ICaptivePortal" am: ca55fb73c7 am: 50746281b1
am: 2805094523 -s ours
am skip reason: change_id Ib6a89e54312628662b130fbeec18d11e139f09fa with SHA1 b68d1465ec is in history

Change-Id: Id24f7fd07472e541d109c6fd08be78bdc2c2bf6a
2019-02-15 00:43:22 -08:00
Remi NGUYEN VAN
2805094523 Merge "Remove NetworkMonitor dependency on ICaptivePortal" am: ca55fb73c7
am: 50746281b1

Change-Id: I60c67a42bce60615f7e0ce86aaafac4fbff19795
2019-02-15 00:34:13 -08:00
Remi NGUYEN VAN
50746281b1 Merge "Remove NetworkMonitor dependency on ICaptivePortal"
am: ca55fb73c7

Change-Id: Ia0d06e1aa931cdc1c6dd4008e804a6a44ae2304f
2019-02-15 00:26:34 -08:00
Remi NGUYEN VAN
ca55fb73c7 Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 08:09:29 +00:00
Remi NGUYEN VAN
19a2f104e9 Merge "Move NetworkStack to services.net" 2019-02-15 07:25:09 +00:00
Xin Li
3ac34e4656 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master am: 7687edd138 -s ours
am: 53d22dac86 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0b6f1151f8552b8a78ab6263fc5f4676444b37c
2019-02-14 21:46:01 -08:00
Remi NGUYEN VAN
fc40b408d5 Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 05:39:14 +00:00
Xin Li
98aa396abe [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: 4bf096e345 -s ours
am: 60571685b0 -s ours
am skip reason: subject contains skip directive

Change-Id: I333d887a77e5ff5f0949c02fc460b8d23cded964
2019-02-14 21:02:00 -08:00
Remi NGUYEN VAN
f1c624afd1 Move NetworkStack to services.net
NetworkStack is only used in services.net or clients of services.net. It
cannot stay in framework.jar because it needs to depend on AIDL
interfaces, which would conflict with app implementations if they were
in framework.jar.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: Ib1d08a3669983640119d008db7e2990fa798724f
Merged-In: I501b125a388c1100c2182bde4670944c2f0d7a02
2019-02-15 12:20:17 +09:00
Remi NGUYEN VAN
89fbdc360d Remove NetworkMonitor dependency on ICaptivePortal
ICaptivePortal is used in the framework and cannot be used as a
dependency in NetworkMonitor, as the framework class takes precedence
when linking.
Also fix NetworkMonitorTest that was not verifying the right
startCaptivePortalApp call.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: I8e7bb79e50650ae182a2e4277fb49abf5fb6d910
Merged-In: Ib6a89e54312628662b130fbeec18d11e139f09fa
2019-02-15 12:20:03 +09:00
Varun Anand
273f900b3b Update VPN capabilities when its underlying network set is null.
Previously, they were only updated when underlying network set was
non-null.

This change also ensures that all the calls b/w ConnectivityService and
Vpn that leads to updating capabilities are on ConnectivityService
handler thread.

Additionally, it also ensures that capabilities are propagated after VPN
enters connected state. This was previously done from establish which
could potentially lead to race between VPN getting connected and
capabilities getting updated.

This change also updates VPN capabilities inline from
ConnectivityService handler thread. Previously, there was an additional
loop where Vpn would update capabilities via NetworkAgent thru
AsyncChannel which posts back to CS handler thread, which could
potentially lead to delays in updating VPN capabilities.

Bug: 119129310
Bug: 118856062
Bug: 124268198
Test: atest FrameworksNetTests
Test: manual - verified VPNs capabilities are getting updated and
DownloadManager is working correctly.

Change-Id: Id0abc4d304bb096e92479a118168690ccce634ed
2019-02-14 18:50:56 -08:00
Xin Li
53d22dac86 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
am: 7687edd138 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifbfb1fb0db0d4771a968c0c9819dd03c5f2e549b
2019-02-14 16:41:23 -08:00
Xin Li
60571685b0 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am: 4bf096e345 -s ours
am skip reason: subject contains skip directive

Change-Id: I49505ddfda138f983dd8a75361f270549254f4f8
2019-02-14 14:33:10 -08:00
Xin Li
7687edd138 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master 2019-02-14 22:11:32 +00:00
Benedict Wong
5d66b45e94 Merge "Add Test Network and Transport types" am: df27f67993 am: 3a7e4f86ae
am: 61e8e7a054

Change-Id: Ia9c100ebeb8b54e743820b74ff35d006919e9fbb
2019-02-14 11:08:57 -08:00
Benedict Wong
61e8e7a054 Merge "Add Test Network and Transport types" am: df27f67993
am: 3a7e4f86ae

Change-Id: I371a4f3bdbbfd001e9694e29843b6b7119b938b0
2019-02-14 10:59:02 -08:00
Benedict Wong
3a7e4f86ae Merge "Add Test Network and Transport types"
am: df27f67993

Change-Id: I1cf33485adb9f4c442de42060697efe71bb45264
2019-02-14 10:49:48 -08:00
Benedict Wong
df27f67993 Merge "Add Test Network and Transport types" 2019-02-14 18:37:04 +00:00
Xin Li
4bf096e345 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
stage-aosp-master

Bug: 124234733
Change-Id: Ic4f67fde0835da0b1c363906cccef0d244e38393
2019-02-14 09:48:06 -08:00
Remi NGUYEN VAN
4e4f8da24b Move NetworkStack to services.net
NetworkStack is only used in services.net or clients of services.net. It
cannot stay in framework.jar because it needs to depend on AIDL
interfaces, which would conflict with app implementations if they were
in framework.jar.

(cherry-pick of aosp/905233 with trivial conflicts in SystemServer.java)

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: I501b125a388c1100c2182bde4670944c2f0d7a02
2019-02-14 20:43:43 +09:00
Remi NGUYEN VAN
b68d1465ec Remove NetworkMonitor dependency on ICaptivePortal
ICaptivePortal is used in the framework and cannot be used as a
dependency in NetworkMonitor, as the framework class takes precedence
when linking.
Also fix NetworkMonitorTest that was not verifying the right
startCaptivePortalApp call.

(cherry-pick of aosp/904953 with minor conflict in Android.bp)

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: Ib6a89e54312628662b130fbeec18d11e139f09fa
2019-02-14 20:36:40 +09:00
Remi NGUYEN VAN
bfaaa25c7f Merge "Fix flaky testNattSocketKeepalives" am: 296c5ed68d am: 793f58bb98
am: 0709f0a13f

Change-Id: Ibfdd4dddb8dad9ee26f9f1ec175ca87bc46ce761
2019-02-13 21:45:39 -08:00
Remi NGUYEN VAN
0709f0a13f Merge "Fix flaky testNattSocketKeepalives" am: 296c5ed68d
am: 793f58bb98

Change-Id: I20ec043e5caeb61c4e31f087a10deb2dc13c0d95
2019-02-13 21:24:35 -08:00
Lucas Lin
e9a141e52b Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a am: 460b42bc65
am: 741c4b7439

Change-Id: I2ef6009364bd1420c915df003e2ff5c3857ef3e7
2019-02-13 21:20:09 -08:00
Lucas Lin
741c4b7439 Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a
am: 460b42bc65

Change-Id: I441a37682e11aa349301750c26545c5c0f1a274a
2019-02-13 21:04:01 -08:00
Remi NGUYEN VAN
793f58bb98 Merge "Fix flaky testNattSocketKeepalives"
am: 296c5ed68d

Change-Id: Ie9fe40e3bcf4187a2e5cbf525bc4e874cff70747
2019-02-13 20:42:01 -08:00
Lucas Lin
460b42bc65 Merge "Clear all lingering notifications when network is disconnected"
am: 1037bbb82a

Change-Id: I2d9f84840cdc73ed3b30278d7a9dbeefff233fa3
2019-02-13 20:29:03 -08:00
Remi NGUYEN VAN
296c5ed68d Merge "Fix flaky testNattSocketKeepalives" 2019-02-14 03:29:00 +00:00
Remi NGUYEN VAN
cb0b1fc561 Fix flaky testNattSocketKeepalives
The test did not wait for the WifiNetworkAgent to disconnect, and there
are reports of flakes where it is still connected in
connectKeepaliveNetwork.

Test: atest FrameworksNetTests
Bug: 124319553
Change-Id: I85968806885c8853ec4f4dbea356366c1af0ea1c
2019-02-14 03:28:48 +00:00
lucaslin
b5b671abfd Clear all lingering notifications when network is disconnected
In aosp/861571, it tried to refine the design to prevent the
lingering notification is cleared unexpectedly. However, all
notifications should be cleared when network is disconnected.
Refine the design by clearing all lingering notifications when
network is disconnected.

Bug: 123488640
Bug: 123537643
Test: 1.Build pass
      2.atest FrameworksNetTests
      3.Connect to a hotspot which doesn't have internet,
      after getting "NO_INTERNET" notification, disconnect
      the wifi and check if "NO_INTERNET" notification will
      be cleared or not.
Change-Id: Iac45ec186cf81915c318dba37f43136609d579f6
2019-02-13 03:23:10 +00:00
Remi NGUYEN VAN
2c47aed7dc Merge "Remove hard-coded NetworkStack package name" am: 20bda51d6c am: dba80faaf0
am: ff38ce4336

Change-Id: Ic93c22e03a4ead4ec37b955993a32c8ce284e0a6
2019-02-11 20:44:47 -08:00
Remi NGUYEN VAN
ff38ce4336 Merge "Remove hard-coded NetworkStack package name" am: 20bda51d6c
am: dba80faaf0

Change-Id: If82997f9f46a34014e797f10a71c34bfb4150585
2019-02-11 20:34:20 -08:00
Remi NGUYEN VAN
dba80faaf0 Merge "Remove hard-coded NetworkStack package name"
am: 20bda51d6c

Change-Id: I0e67a5e857d4f5ba2af1f0928be6d97c0f4ce94f
2019-02-11 20:22:40 -08:00
Remi NGUYEN VAN
20bda51d6c Merge "Remove hard-coded NetworkStack package name" 2019-02-12 03:58:09 +00:00
Benedict Wong
8015602ac9 Add Test Network and Transport types
This change adds new network types for testing purposes, signifying a
network with an extremely limited feature set.

Bug: 72950854
Test: Compiles, CTS tests relying on this work correctly.
Change-Id: I06cade6044afd12e0b69ed3c2f160f27f85d43d0
2019-02-11 12:57:43 -08:00
android-build-team Robot
9def767db8 Snap for 5180536 from b96a8ade50 to pi-platform-release
Change-Id: I7c5a9c9e96572c32eadd97448c4886f9c9150a19
2019-02-09 02:33:11 +00:00
Remi NGUYEN VAN
8b3999ca8b Remove hard-coded NetworkStack package name
Have the network stack pass its package name in
showProvisioningNotification instead.

Bug: 124033493
Test: flashed, WiFi and captive portal works
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1f3312768ba1fb34e99a827e1fcdaf7510e318a8
2019-02-08 12:12:57 +09:00
Remi NGUYEN VAN
d1cbc54cfb Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 641c68cfdb am: 9b177fe2f7
am: ebca092387

Change-Id: I0a52fc46a22d21147ab7d1594fd79182b5f23eb7
2019-02-06 20:10:28 -08:00
Remi NGUYEN VAN
ebca092387 Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 641c68cfdb
am: 9b177fe2f7

Change-Id: I5684b4fdc0e1030d372287d53f22b66fe8d90420
2019-02-06 19:58:59 -08:00
Remi NGUYEN VAN
9b177fe2f7 Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService"
am: 641c68cfdb

Change-Id: I5bc7a8dae5667a1509f9741be571008a919b6461
2019-02-06 19:50:15 -08:00
Remi NGUYEN VAN
641c68cfdb Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" 2019-02-07 03:33:54 +00:00
Remi NGUYEN VAN
c4e7c31749 Merge "Add API for NetworkStack to start captive portal" am: 26b11cdf44 am: 14b3b4bebc
am: 05c324d60a

Change-Id: I54a32dd01f1f697fc7da703bc1d258ed6a43df23
2019-02-06 19:08:29 -08:00