Pavel Maltsev
fbb48a210f
Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc
...
am: 6d8274ebf1
2018-03-07 23:09:04 +00:00
Pavel Maltsev
6d8274ebf1
Merge "Minor clean-up in NetworkCapabilities"
...
am: 98dc002acc
2018-03-07 23:00:53 +00:00
Treehugger Robot
98dc002acc
Merge "Minor clean-up in NetworkCapabilities"
2018-03-07 21:06:59 +00:00
Andreas Gampe
38bc90d5a6
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
32323983bf
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
2e65c25a1d
Merge "Allow null subscriberId in NetworkStatsManager." am: 0b9c645be1
...
am: 2067767d99
2018-03-06 19:52:57 +00:00
Andreas Gampe
c826cccc8d
Merge "Connectivity: Fix map access" am: da5e6f2b0e
...
am: 75b5a67cb4
2018-03-06 19:38:18 +00:00
Remi NGUYEN VAN
2067767d99
Merge "Allow null subscriberId in NetworkStatsManager."
...
am: 0b9c645be1
2018-03-06 19:37:13 +00:00
Andreas Gampe
75b5a67cb4
Merge "Connectivity: Fix map access"
...
am: da5e6f2b0e
2018-03-06 19:20:32 +00:00
Lorenzo Colitti
c6eac511f4
Merge "Minor cleanups to NetworkStats interface tracking." am: 6455e31b76
...
am: 4d8eedc35f
2018-03-06 07:47:11 +00:00
Lorenzo Colitti
4d8eedc35f
Merge "Minor cleanups to NetworkStats interface tracking."
...
am: 6455e31b76
Change-Id: I84aad4b9815196e0362d6adba34359a260853f46
2018-03-06 07:28:20 +00:00
Remi NGUYEN VAN
0b9c645be1
Merge "Allow null subscriberId in NetworkStatsManager."
2018-03-06 06:52:35 +00:00
Treehugger Robot
da5e6f2b0e
Merge "Connectivity: Fix map access"
2018-03-06 05:39:39 +00:00
Remi NGUYEN VAN
ccd9b36e7b
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
c77e9e60ee
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
e96e2e221c
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
07aeacfbd5
Merge "Extend network request to query networks w/o capabilites" am: 762a14565b am: 76136de729
...
am: 60bcd4b9d9
2018-03-03 00:14:52 +00:00
Pavel Maltsev
60bcd4b9d9
Merge "Extend network request to query networks w/o capabilites" am: 762a14565b
...
am: 76136de729
2018-03-03 00:03:37 +00:00
Pavel Maltsev
76136de729
Merge "Extend network request to query networks w/o capabilites"
...
am: 762a14565b
2018-03-02 23:52:18 +00:00
Treehugger Robot
762a14565b
Merge "Extend network request to query networks w/o capabilites"
2018-03-02 19:04:31 +00:00
Chalard Jean
0c788ec3df
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32 am: e999899287
...
am: f6c1bf66ba
2018-03-02 13:25:02 +00:00
Chalard Jean
f6c1bf66ba
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32
...
am: e999899287
2018-03-02 13:17:23 +00:00
Chalard Jean
e999899287
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
...
am: dce4d4ca32
2018-03-02 13:10:45 +00:00
Chalard Jean
1618bad6e0
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: ef307293e5 am: 58c3355b8f
...
am: d98aec5eee
2018-03-02 12:54:29 +00:00
Chalard Jean
d98aec5eee
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: ef307293e5
...
am: 58c3355b8f
2018-03-02 12:46:46 +00:00
Chalard Jean
58c3355b8f
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
...
am: ef307293e5
2018-03-02 12:34:25 +00:00
Chalard Jean
dce4d4ca32
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
2018-03-02 11:52:15 +00:00
Chalard Jean
ef307293e5
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
2018-03-02 11:18:10 +00:00
Chalard Jean
8895306c4a
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
687546ed4d
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
Pavel Maltsev
42016b3e96
Minor clean-up in NetworkCapabilities
...
Follow up clean up for aosp/606338
Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I2d2cfeb51caaa339602f7d97ffffed6e4cfad432
2018-03-01 18:06:25 -08:00
Pavel Maltsev
40ba60c765
Extend network request to query networks w/o capabilites
...
Add another bit mask into NetworkCapabilities class that represents
unwanted capabilities and corresponding methods to add and remove them.
Bug: 72828388
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/
Change-Id: Ie291167eb74fdb696c7ee145c8cc46ea8115d6ba
2018-03-01 17:52:02 -08:00
Chalard Jean
1c8ffcfc46
Merge "Fix up NetworkCapabilities' toString" am: ef16e8daab am: 2e4c0bf13c
...
am: 7f245b1f71
2018-03-01 06:13:04 +00:00
Chalard Jean
7f245b1f71
Merge "Fix up NetworkCapabilities' toString" am: ef16e8daab
...
am: 2e4c0bf13c
2018-03-01 05:56:33 +00:00
Chalard Jean
2e4c0bf13c
Merge "Fix up NetworkCapabilities' toString"
...
am: ef16e8daab
2018-03-01 05:48:14 +00:00
Chalard Jean
ef16e8daab
Merge "Fix up NetworkCapabilities' toString"
2018-03-01 04:01:16 +00:00
Chalard Jean
8337e58db2
Fix up NetworkCapabilities' toString
...
Test: manual
Change-Id: I3bcec6a6873e8ec7ced0820d3d5b92249b19fe0a
2018-02-28 19:47:48 +09:00
Pavel Maltsev
f12177caec
Merge "Add OEM_PAID network capability" am: 230f251155 am: 35999ae101
...
am: fe1ed24e15
2018-02-28 08:42:24 +00:00
Pavel Maltsev
fe1ed24e15
Merge "Add OEM_PAID network capability" am: 230f251155
...
am: 35999ae101
2018-02-28 08:28:25 +00:00
Pavel Maltsev
35999ae101
Merge "Add OEM_PAID network capability"
...
am: 230f251155
2018-02-28 08:14:48 +00:00
Treehugger Robot
230f251155
Merge "Add OEM_PAID network capability"
2018-02-28 07:06:00 +00:00
Andreas Gampe
f45323be96
Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a am: 3a3bcf699f
...
am: 19a31611ce
2018-02-27 19:39:51 +00:00
Andreas Gampe
19a31611ce
Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a
...
am: 3a3bcf699f
2018-02-27 19:19:01 +00:00
Andreas Gampe
3a3bcf699f
Merge "Frameworks: Annotate JUnit4 test with @Test"
...
am: 4d9bec6b4a
Change-Id: I0c684a434a0f43fcae1a766c6c84a756115d9dcb
2018-02-27 19:07:49 +00:00
Andreas Gampe
71510464df
Frameworks: Annotate JUnit4 test with @Test
...
Mollify Errorprone.
Bug: 72076216
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest IpSecServiceParameterizedTest
Change-Id: Ia3a253c4c5994937efc0f498ac047c5fb4eee3e9
2018-02-26 08:09:26 -08:00
Jeff Sharkey
c80b318dae
Name specific app for rapid data usage.
...
When a single app is responsible for more than half of the data usage
that caused us to trigger a "rapid usage" alert, name that app in the
notification. Tests to verify.
Move NPMS->NSS direct calls to "Internal" pattern, following
best-practices to avoid unnecessary AIDL exposure.
Remove 3G/4G split mobile plan support, which has been deprecated for
years and was never supported in a shipping product.
Move MultipathPolicyTracker in tree to reflect its package name.
Test: bit FrameworksNetTests:*
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 69263587, 64221505, 73431080, 72746951
Exempt-From-Owner-Approval: approved in previous PS
Change-Id: I3e4ec1ae2222d51b232f76f32faca93d4f8cd272
2018-02-23 16:27:39 +00:00
nharold
8974c107ae
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688 am: 4f00de4aad
...
am: 137c833e70
2018-02-20 23:21:59 +00:00
nharold
137c833e70
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688
...
am: 4f00de4aad
2018-02-20 23:07:53 +00:00
nharold
4f00de4aad
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
...
am: f6bbc21688
2018-02-20 22:55:38 +00:00
nharold
f6bbc21688
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
2018-02-20 19:17:23 +00:00
