nharold
d863c59e17
Merge "Check mOwnedByTransform to avoid DELSA on SPI" am: 94d8fa0da6
...
am: af4c28192c
2018-03-21 05:01:47 +00:00
nharold
af4c28192c
Merge "Check mOwnedByTransform to avoid DELSA on SPI"
...
am: 94d8fa0da6
Change-Id: Id194eb67947e9dae369b2a2d30b55e7e1cf2d7c8
2018-03-21 03:36:44 +00:00
Nathan Harold
bd12ffffc0
Check mOwnedByTransform to avoid DELSA on SPI
...
The owned by transform flag prevents the removal
of an SPI from accidentally deleting an associated
SA in the kernel. That flag wasn't actually being
checked, so deleting an SPI would result in the
transform being removed.
The existing code already guarantees that the SA is
deleted when the transform is deleted
Bug: 73258845
Test: runtest frameworks-net
Change-Id: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
2018-03-20 11:26:29 -07:00
Benedict Wong
696b853a11
Merge "Added implementation for VTI add/remove address" am: 3f3410ae6b
...
am: c9b0114429
2018-03-20 00:09:15 +00:00
Benedict Wong
c9b0114429
Merge "Added implementation for VTI add/remove address"
...
am: 3f3410ae6b
2018-03-19 23:45:10 +00:00
Benedict Wong
3f3410ae6b
Merge "Added implementation for VTI add/remove address"
2018-03-19 22:05:09 +00:00
Benedict Wong
0da1f39e22
Added implementation for VTI add/remove address
...
This change adds implementation details for add/remove addresses onto a
VTI.
Bug: 73675031
Test: New tests added, passing on Walleye
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
2018-03-16 10:25:43 -07:00
Pavel Maltsev
3152f214df
Merge "Fixing comments in Network Capabilities" am: b6477d22ca
...
am: 2c36870f3d
2018-03-12 08:08:31 +00:00
Pavel Maltsev
2c36870f3d
Merge "Fixing comments in Network Capabilities"
...
am: b6477d22ca
2018-03-12 07:57:07 +00:00
Treehugger Robot
b6477d22ca
Merge "Fixing comments in Network Capabilities"
2018-03-12 07:42:58 +00:00
Chalard Jean
69dcff707c
Merge "Deprecate most of NetworkInfo." into pi-dev
...
am: bf7610aa8a
2018-03-10 08:08:09 +00:00
Chalard Jean
bf7610aa8a
Merge "Deprecate most of NetworkInfo." into pi-dev
2018-03-10 07:51:11 +00:00
Chad Brubaker
e5430e041f
Merge "Expose CONNECTIVITY_ACTION to Instant Apps" into pi-dev
...
am: aa72b2036a
Change-Id: I0434f8c7292a85e25df3da2858e4d89cf55fab3d
2018-03-10 06:20:56 +00:00
Pavel Maltsev
1f9f48e1c4
Fixing comments in Network Capabilities
...
Clean up after aosp/606338
Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891
2018-03-09 10:42:32 -08:00
Chalard Jean
17a24cb956
Merge "Deprecate most of NetworkInfo." am: 58ae164c97
...
am: 97aaa25bf0
2018-03-09 13:12:08 +00:00
Chalard Jean
97aaa25bf0
Merge "Deprecate most of NetworkInfo."
...
am: 58ae164c97
2018-03-09 12:57:15 +00:00
Chalard Jean
58ae164c97
Merge "Deprecate most of NetworkInfo."
2018-03-09 09:46:11 +00:00
Chalard Jean
7eaf3b10e5
Deprecate most of NetworkInfo.
...
getType, getTypeName, isConnectedOrConnecting, isConnected,
isAvaisable, isFailover, isRoaming, getState, getDetailedState,
getReason, and the TYPE_* constants in ConnectivityManager
along with methods that use them are now stacked on a boat
bound for the other side of the Styx.
Test: no code changes
Bug: 62844794
Change-Id: Idd70763de5b1af5580b4734cd443ac4b570069cc
2018-03-09 16:52:20 +09:00
Chalard Jean
e15d4ceee3
Deprecate most of NetworkInfo.
...
getType, getTypeName, isConnectedOrConnecting, isConnected,
isAvaisable, isFailover, isRoaming, getState, getDetailedState,
getReason, and the TYPE_* constants in ConnectivityManager
along with methods that use them are now stacked on a boat
bound for the other side of the Styx.
Test: no code changes
Bug: 62844794
Change-Id: Idd70763de5b1af5580b4734cd443ac4b570069cc
2018-03-09 15:38:25 +09:00
Chad Brubaker
caced413da
Expose CONNECTIVITY_ACTION to Instant Apps
...
Test: Broadcast is visible to Instant Apps
Bug: 69421898
Change-Id: I8435e7723cf7a722668b97ff087d1f4453d3e7b7
2018-03-08 10:37:09 -08:00
Pavel Maltsev
5d97ad9fe4
Merge "Minor clean-up in NetworkCapabilities" am: 1dd43b192c
...
am: 6ab3c9c246
2018-03-07 23:09:04 +00:00
Pavel Maltsev
6ab3c9c246
Merge "Minor clean-up in NetworkCapabilities"
...
am: 1dd43b192c
2018-03-07 23:00:53 +00:00
Treehugger Robot
1dd43b192c
Merge "Minor clean-up in NetworkCapabilities"
2018-03-07 21:06:59 +00:00
Andreas Gampe
2a0cf0d5c5
Merge "Connectivity: Fix map access" into pi-dev
...
am: 1fff4c000d -s ours
Change-Id: I03b95b31613c6cfd702497e822c5690f78547b21
2018-03-07 05:01:53 +00:00
Andreas Gampe
85c8c3d822
Connectivity: Fix map access
...
Found by Errorprone.
Bug: 73288226
Test: mmma frameworks/base/services
Merged-In: I1c4b35811c72d389e53e28c3eb1b411009471b92
Merged-In: Ice91ac58257551485231da4664027a281237de4b
Merged-In: I7d2f578b54c69139be8b887a2381ac1b2e0673a3
Change-Id: I63edad58dbc909c1e772bde85a1b9dd98c551fb1
(cherry picked from commit 3ba8106c23cdf518527f75beaabb48bf3182fb4d)
2018-03-07 11:36:57 +09:00
Remi NGUYEN VAN
1252af5564
Merge "Allow null subscriberId in NetworkStatsManager." am: 09639d8ad0
...
am: cbcf2a49ea
2018-03-06 19:52:57 +00:00
Andreas Gampe
97442c25ec
Merge "Connectivity: Fix map access" am: a1b71308b5
...
am: 89c0d57a15
2018-03-06 19:38:18 +00:00
Remi NGUYEN VAN
cbcf2a49ea
Merge "Allow null subscriberId in NetworkStatsManager."
...
am: 09639d8ad0
2018-03-06 19:37:13 +00:00
Andreas Gampe
89c0d57a15
Merge "Connectivity: Fix map access"
...
am: a1b71308b5
2018-03-06 19:20:32 +00:00
Lorenzo Colitti
9423045c3d
Merge "Minor cleanups to NetworkStats interface tracking." am: 6455e31b76
...
am: 9d04a8c92d
2018-03-06 07:47:11 +00:00
Lorenzo Colitti
9d04a8c92d
Merge "Minor cleanups to NetworkStats interface tracking."
...
am: 6455e31b76
Change-Id: I84aad4b9815196e0362d6adba34359a260853f46
2018-03-06 07:28:20 +00:00
Remi NGUYEN VAN
09639d8ad0
Merge "Allow null subscriberId in NetworkStatsManager."
2018-03-06 06:52:35 +00:00
Treehugger Robot
a1b71308b5
Merge "Connectivity: Fix map access"
2018-03-06 05:39:39 +00:00
Remi NGUYEN VAN
a08eb7203b
Allow null subscriberId in NetworkStatsManager.
...
Use a MATCH_MOBILE_WILDCARD template to avoid filtering by
subscriberId when querying statistics from NetworkStatsService.
Bug: 74038898
Change-Id: I4b39e7031416cb33b23d89aa36ff0f774eaa942f
Fixes: 74038898
Test: runtest frameworks-net, CTS tests pass
2018-03-06 13:28:19 +09:00
Andreas Gampe
39744fd0c7
Connectivity: Fix map access
...
Found by Errorprone.
Bug: 73288226
Test: mmma frameworks/base/services
Change-Id: I63edad58dbc909c1e772bde85a1b9dd98c551fb1
2018-03-05 17:23:07 -08:00
Lorenzo Colitti
54ddecb0f8
Minor cleanups to NetworkStats interface tracking.
...
Currently, when a network goes into CONNECTED state, we call
updateLinkProperties and then notifyIfacesChangedForNetworkStats.
The latter is unnecessary, as there are exactly two cases:
1. networkAgent.linkProperties != null: updateLinkProperties will
call notifyIfacesChangedForNetworkStats, because oldLp is null
and networkAgent.linkProperties is not null.
2. networkAgent.linkProperties is null: there is no need to call
notifyIfacesChangedForNetworkStats, because no interfaces were
added or removed. When they are, updateLinkProperties will be
called again.
Removing the call to notifyIfacesChangedForNetworkStats avoids
a stats poll, which is a minor performance improvement.
Also, remove the NetworkStatsService code to do asynchronous
interface updates, since it has no callers.
Bug: 72107146
Test: builds, boots
Test: runtest frameworks-net
Change-Id: I9337ea26c0505a1c66ceda01254b68e25cd7972c
2018-03-05 15:48:23 +09:00
Pavel Maltsev
1016f7327a
Merge "Extend network request to query networks w/o capabilites" am: 47d4d15483 am: 334cde1ec2
...
am: fa04c2d802
2018-03-03 00:14:52 +00:00
Pavel Maltsev
fa04c2d802
Merge "Extend network request to query networks w/o capabilites" am: 47d4d15483
...
am: 334cde1ec2
2018-03-03 00:03:37 +00:00
Pavel Maltsev
334cde1ec2
Merge "Extend network request to query networks w/o capabilites"
...
am: 47d4d15483
2018-03-02 23:52:18 +00:00
Treehugger Robot
47d4d15483
Merge "Extend network request to query networks w/o capabilites"
2018-03-02 19:04:31 +00:00
Chalard Jean
0a8dbc7886
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: faed85f2b0 am: 331e50f601
...
am: ec7c68cb2b
2018-03-02 13:25:02 +00:00
Chalard Jean
ec7c68cb2b
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: faed85f2b0
...
am: 331e50f601
2018-03-02 13:17:23 +00:00
Chalard Jean
331e50f601
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
...
am: faed85f2b0
2018-03-02 13:10:45 +00:00
Chalard Jean
562e154642
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: f477aedec5 am: 7506c131c1
...
am: 941de3f74c
2018-03-02 12:54:29 +00:00
Chalard Jean
941de3f74c
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: f477aedec5
...
am: 7506c131c1
2018-03-02 12:46:46 +00:00
Chalard Jean
7506c131c1
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
...
am: f477aedec5
2018-03-02 12:34:25 +00:00
Chalard Jean
faed85f2b0
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
2018-03-02 11:52:15 +00:00
Chalard Jean
f477aedec5
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
2018-03-02 11:18:10 +00:00
Chalard Jean
9a396cc3c6
Give apps with NETWORK_SETTINGS right to see any VPN.
...
...not only the ones that apply to them.
Bug: 73217368
Test: runtest frameworks-net and CTS
Change-Id: I436972a3e51e98bdd815771b451bcedadf684763
2018-03-02 17:10:11 +09:00
Chalard Jean
9cbc882c08
Give VPNs the INTERNET capability when they route most of the IP space
...
Test: manual, plus wrote some new tests for this
Bug: 72765718
Change-Id: I9759da72b752fd8eeb1d0647db9ab341f04c0528
2018-03-02 16:20:22 +09:00
