Commit Graph

6024 Commits

Author SHA1 Message Date
Xin Li
fa29eaeec0 [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 2348103b5a -s ours
am: f0ebf61021 -s ours
am skip reason: subject contains skip directive

Change-Id: I2b3cf7ba11fc80010badbb212902a5507d5caae0
2019-02-25 17:16:05 -08:00
Xin Li
f0ebf61021 [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 2348103b5a -s ours
am skip reason: subject contains skip directive

Change-Id: I6c115125bad894bbb597557f2e9c3de3eb2b95b5
2019-02-25 16:13:06 -08:00
Remi NGUYEN VAN
9a12f8c3d8 Merge "Add logging to NetworkStackClient" am: b4ef756571 am: 3c771cc3e6
am: 7bbea3f191

Change-Id: I7241888c779e8f47161dc2f555e140555134434c
2019-02-25 10:32:55 -08:00
Chenbo Feng
c4af054a40 Merge "Send special permission information to netd" am: 84537c00b2 am: 26018a4836
am: 3549052c98

Change-Id: Icb1fa5d980f74902fd085580a7534a5ad7cd00a0
2019-02-25 10:26:51 -08:00
Remi NGUYEN VAN
7bbea3f191 Merge "Add logging to NetworkStackClient" am: b4ef756571
am: 3c771cc3e6

Change-Id: Ib2f6bcda2429346d0418b460bc040fc5e9edbe97
2019-02-25 09:14:44 -08:00
Chenbo Feng
3549052c98 Merge "Send special permission information to netd" am: 84537c00b2
am: 26018a4836

Change-Id: I80271fa7c4e1c6a8e2eea55adf12abaece64d8da
2019-02-25 09:10:05 -08:00
Etan Cohen
934718ad61 Merge "[CS] Support "instant failure" from factories" 2019-02-22 14:29:39 +00:00
Xin Li
2348103b5a DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
2019-02-21 16:02:06 -08:00
Remi NGUYEN VAN
3c771cc3e6 Merge "Add logging to NetworkStackClient"
am: b4ef756571

Change-Id: I0fe820c6feab3caa9ad0739df100553b2d4374e0
2019-02-21 14:28:46 -08:00
Remi NGUYEN VAN
b4ef756571 Merge "Add logging to NetworkStackClient" 2019-02-21 22:13:31 +00:00
Chenbo Feng
26018a4836 Merge "Send special permission information to netd"
am: 84537c00b2

Change-Id: I35aa015a9448b5f8563da0aee40afd3101df29ff
2019-02-21 13:30:32 -08:00
Treehugger Robot
84537c00b2 Merge "Send special permission information to netd" 2019-02-21 20:27:58 +00:00
Remi NGUYEN VAN
a00a3f255d Add logging to NetworkStackClient
The current logging relies on the system log that may rotate. This is a
problem to investigate bugs where the network stack service is not
started. Add a SharedLog to NetworkStackClient and dump it in
ConnectivityService (for lack of a better place to dump it).

Bug: 124307802
Test: Booted, dumpsys connectivity shows the log
Change-Id: If596451d0613645f68a8a32acb032eea76ea506c
2019-02-21 17:09:12 +09:00
Chenbo Feng
002c556145 Send special permission information to netd
Netd need the list of apps that have permission INTERNET or permission
UPDATE_DEVICE_STATS at run time to make decisions about application
request. To avoid protential deadlock and reduce the traffic between
netd and system server, Use packageManagerServcie to send the list of
apps that have those permissions to netd when device boot and when new
apps get installed.

Bug: 111560570
Bug: 111560739
Test: install and uninstall packages and dumpsys netd trafficcontroller
Change-Id: Idb9905f424557a5c59e35d41f5eafe345aca87e0
2019-02-20 14:07:18 -08:00
Varun Anand
6043ff3423 [automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev am: b4b64ad602 -s ours
am: 007d15e33d -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: Icab5d7a43a26be9a4c2d01279453571062b2a808
2019-02-20 12:36:39 -08:00
Varun Anand
007d15e33d [automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev
am: b4b64ad602 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I8cdd422bf5686c707d60137eccb4e1caae8194a3
2019-02-20 12:14:20 -08:00
Xin Li
f8813cbe3f [automerger skipped] Merge changes from topic "PPRL.190205.001" am: f6abf78795 -s ours am: 0b448cafc4 -s ours
am: c859266980 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 afc94d724c is in history

Change-Id: I9d0dd19c248b350d12233c4d9a71a30659021388
2019-02-20 11:26:07 -08:00
Varun Anand
5ffc7e609f 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 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.

(cherry picked from commit 273f900b3b)

Change-Id: Iae5f2024b19df04c31938815b52687781d016cde
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
2019-02-20 18:37:44 +00:00
Xin Li
c859266980 [automerger skipped] Merge changes from topic "PPRL.190205.001" am: f6abf78795 -s ours
am: 0b448cafc4 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221f6 is in history

Change-Id: If0a545f1a09f0a4471f2c6adadfe79ad434bebd4
2019-02-20 10:36:50 -08:00
Xin Li
0b448cafc4 [automerger skipped] Merge changes from topic "PPRL.190205.001"
am: f6abf78795 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221f6 is in history

Change-Id: Ieb824b633f240abc96ee25f39c68f55f1bd621bd
2019-02-20 10:17:48 -08:00
Xin Li
f6abf78795 Merge changes from topic "PPRL.190205.001"
* changes:
  Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
  DO NOT MERGE - Merge PPRL.190205.001 into master
2019-02-20 16:25:58 +00:00
Rubin Xu
83b2851cea Merge "Skip unreachable route when estimating VPN destinations" am: 3b3871c9e5 am: a480624ebd
am: e99c91555c

Change-Id: Id81038035eddf98d0c4546ddb25c8f6ed5736ad6
2019-02-20 04:35:38 -08:00
Rubin Xu
e99c91555c Merge "Skip unreachable route when estimating VPN destinations" am: 3b3871c9e5
am: a480624ebd

Change-Id: Ia9301b3bf52b42a742f1f6b3a02499a1404ed3f1
2019-02-20 04:26:25 -08:00
Rubin Xu
a480624ebd Merge "Skip unreachable route when estimating VPN destinations"
am: 3b3871c9e5

Change-Id: Iafa9ecaf07a36f235b366655d2fa2165a676d1cd
2019-02-20 04:15:55 -08:00
Treehugger Robot
3b3871c9e5 Merge "Skip unreachable route when estimating VPN destinations" 2019-02-20 12:00:15 +00:00
Rubin Xu
1faa896f77 Skip unreachable route when estimating VPN destinations
Bug: 122652441
Test: atest com.android.server.connectivity.VpnTest
Test: Establish a IPv4 VPN with minimal routes and check
(dumpsys connectivity) the VPN network does not have INTERNET
capability.

Change-Id: Ic7f19ebb7b7f78a6ffb2a8ec3fc3eca5e5421f57
2019-02-19 17:18:34 +00:00
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