Pavel Maltsev
2d8067ed3d
Merge "Extend network request to query networks w/o capabilites" am: d846adac83 am: a3be78b5e7
...
am: f5312f3538
2018-03-03 00:14:52 +00:00
Pavel Maltsev
f5312f3538
Merge "Extend network request to query networks w/o capabilites" am: d846adac83
...
am: a3be78b5e7
2018-03-03 00:03:37 +00:00
Pavel Maltsev
a3be78b5e7
Merge "Extend network request to query networks w/o capabilites"
...
am: d846adac83
2018-03-02 23:52:18 +00:00
Treehugger Robot
d846adac83
Merge "Extend network request to query networks w/o capabilites"
2018-03-02 19:04:31 +00:00
Chalard Jean
d1bf7733af
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 am: e5e819f078
...
am: 1be320a494
2018-03-02 13:25:02 +00:00
Chalard Jean
1be320a494
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478
...
am: e5e819f078
2018-03-02 13:17:23 +00:00
Chalard Jean
e5e819f078
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
...
am: 6001f72478
2018-03-02 13:10:45 +00:00
Chalard Jean
9fae0a82af
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: 20013384dc am: 18e51821b1
...
am: 207b8e2b4e
2018-03-02 12:54:29 +00:00
Chalard Jean
207b8e2b4e
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: 20013384dc
...
am: 18e51821b1
2018-03-02 12:46:46 +00:00
Chalard Jean
18e51821b1
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
...
am: 20013384dc
2018-03-02 12:34:25 +00:00
Chalard Jean
6001f72478
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
2018-03-02 11:52:15 +00:00
Chalard Jean
b552c4655f
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
adbf1d029b
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
1cd48dae22
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
74035dd49d
Merge "Fix up NetworkCapabilities' toString" am: 7959e70ef2 am: 773523a667
...
am: 669194a830
2018-03-01 06:13:04 +00:00
Chalard Jean
669194a830
Merge "Fix up NetworkCapabilities' toString" am: 7959e70ef2
...
am: 773523a667
2018-03-01 05:56:33 +00:00
Chalard Jean
773523a667
Merge "Fix up NetworkCapabilities' toString"
...
am: 7959e70ef2
2018-03-01 05:48:14 +00:00
Chalard Jean
7959e70ef2
Merge "Fix up NetworkCapabilities' toString"
2018-03-01 04:01:16 +00:00
Chalard Jean
07ace0f6cc
Fix up NetworkCapabilities' toString
...
Test: manual
Change-Id: I3bcec6a6873e8ec7ced0820d3d5b92249b19fe0a
2018-02-28 19:47:48 +09:00
Pavel Maltsev
b1a83edb5c
Merge "Add OEM_PAID network capability" am: 4c00edd361 am: 7b87c2050c
...
am: 3b7de55419
2018-02-28 08:42:24 +00:00
Pavel Maltsev
3b7de55419
Merge "Add OEM_PAID network capability" am: 4c00edd361
...
am: 7b87c2050c
2018-02-28 08:28:25 +00:00
Pavel Maltsev
7b87c2050c
Merge "Add OEM_PAID network capability"
...
am: 4c00edd361
2018-02-28 08:14:48 +00:00
Treehugger Robot
4c00edd361
Merge "Add OEM_PAID network capability"
2018-02-28 07:06:00 +00:00
Hugo Benichi
dcf008a071
Merge "Fix NPE in NetworkMetrics" am: cb0714332d am: 34d08160bd
...
am: ca13c0553a
2018-02-24 19:30:40 +00:00
Hugo Benichi
ca13c0553a
Merge "Fix NPE in NetworkMetrics" am: cb0714332d
...
am: 34d08160bd
2018-02-24 19:21:43 +00:00
Hugo Benichi
34d08160bd
Merge "Fix NPE in NetworkMetrics"
...
am: cb0714332d
2018-02-24 19:13:03 +00:00
Hugo Benichi
cb0714332d
Merge "Fix NPE in NetworkMetrics"
2018-02-24 17:54:01 +00:00
Hugo Benichi
e73486bf24
Fix NPE in NetworkMetrics
...
addTcpStatsResult() in NetworkMetrics was not checking for the nullness
of the pendingSummary object and trying to add stats regardless.
This patch fixes addTcpStatsResult() so that it populates pendingSummary
if necessary, similarly to addConnectResult() and addDnsResult()
Bug: 73825228
Test: runtest frameworks-net
Change-Id: I616a4be0e6e5920bd2f5c58292fea769bd516df7
2018-02-24 08:01:30 +09:00
Jeff Sharkey
e0c2995d0f
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
e7e42ceb02
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811 am: ad96984eb5
...
am: 0a177afbb8
2018-02-20 23:21:59 +00:00
nharold
0a177afbb8
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811
...
am: ad96984eb5
2018-02-20 23:07:53 +00:00
nharold
ad96984eb5
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
...
am: 6d5aea8811
2018-02-20 22:55:38 +00:00
nharold
6d5aea8811
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
2018-02-20 19:17:23 +00:00
Chalard Jean
473b3b7f03
Merge "DO NOT MERGE : fix useless import"
2018-02-18 23:14:42 +00:00
Scott Kennedy
9c356d7590
Merge "Add @Nullable to return values in Uri" am: cfc6897a39 am: a03c35d74a
...
am: 68636f2e8a
2018-02-17 08:08:30 +00:00
Scott Kennedy
68636f2e8a
Merge "Add @Nullable to return values in Uri" am: cfc6897a39
...
am: a03c35d74a
2018-02-17 07:58:31 +00:00
Treehugger Robot
cfc6897a39
Merge "Add @Nullable to return values in Uri"
2018-02-17 04:49:23 +00:00
Nathan Harold
63dd81390d
Fix ConnectivityServiceTest for NATT Keepalive
...
Fix test breakages I caused when adding cell
support for NATT keepalives.
-Make the minimum keepalive interval a constant in
ConnectivityManager and use it in tests.
-Re-Disallow IPv6 Keepalives
Bug: 73327535
Test: 'runtest -x ConnectivityServiceTest' now passes
Change-Id: I5ec4367d250ee371014e65c897c3897a25a05e2d
2018-02-16 16:34:50 -08:00
Chalard Jean
77fb07e9e9
DO NOT MERGE : fix useless import
...
This was added to avoid a merge conflict at a sensitive time.
It can (and should) go.
Test: no code change
Change-Id: I11d73e2d988ae61a168aa0f1cc7c2c506f509d30
2018-02-16 17:21:39 +09:00
Hugo Benichi
a654f06d40
Merge "Add missing'}' in javadoc of public API method" am: f50d9fbdc1 am: 054bed5968
...
am: 7b2ffeff58
2018-02-16 07:58:57 +00:00
Hugo Benichi
7b2ffeff58
Merge "Add missing'}' in javadoc of public API method" am: f50d9fbdc1
...
am: 054bed5968
2018-02-16 07:50:57 +00:00
Treehugger Robot
f50d9fbdc1
Merge "Add missing'}' in javadoc of public API method"
2018-02-16 03:19:35 +00:00
Scott Kennedy
e26450b714
Add @Nullable to return values in Uri
...
This makes it much easier to add null-safety when calling this from Kotlin.
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I55c33ad4ff1306afd80c1a5562c54dfcb6068b0b
2018-02-15 23:53:47 +00:00
Pavel Maltsev
43403201e6
Add OEM_PAID network capability
...
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/
Change-Id: I51c07e0c2211d631e90b27468c26b599e7b07bc8
2018-02-15 10:46:00 -08:00
Chalard Jean
243a087568
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: edab226d0e am: 6fe110fa36
...
am: 3d3fa22698
2018-02-15 14:23:57 +00:00
Lorenzo Colitti
cfaaecf9ce
Merge changes Icd56662d,I0ece820f am: 47ef64b0d2 am: bf66580c0b
...
am: 00d125652e
2018-02-15 14:14:36 +00:00
Chalard Jean
3d3fa22698
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: edab226d0e
...
am: 6fe110fa36
2018-02-15 13:09:26 +00:00
Lorenzo Colitti
00d125652e
Merge changes Icd56662d,I0ece820f am: 47ef64b0d2
...
am: bf66580c0b
2018-02-15 11:52:34 +00:00
Chalard Jean
edab226d0e
Merge changes I3d68dbf8,I6ea524bb,I978d9119
...
* changes:
Deprecate CONNECTIVITY_ACTION.
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
Send null UIDs to apps instead of single-uid lists.
2018-02-15 11:25:36 +00:00
Lorenzo Colitti
47ef64b0d2
Merge changes Icd56662d,I0ece820f
...
* changes:
Restrict OWNERS in android.net.*
Add OWNERS to the libandroid_net library.
2018-02-15 10:03:26 +00:00
