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
Pavel Maltsev
7c600431b5
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
3f1d0bb1a3
Merge "Fix up NetworkCapabilities' toString" am: a23d640426 am: 03580e0ccd
...
am: 26afb962f5
2018-03-01 06:13:04 +00:00
Chalard Jean
26afb962f5
Merge "Fix up NetworkCapabilities' toString" am: a23d640426
...
am: 03580e0ccd
2018-03-01 05:56:33 +00:00
Chalard Jean
03580e0ccd
Merge "Fix up NetworkCapabilities' toString"
...
am: a23d640426
2018-03-01 05:48:14 +00:00
Chalard Jean
a23d640426
Merge "Fix up NetworkCapabilities' toString"
2018-03-01 04:01:16 +00:00
Chalard Jean
4409dfa9c7
Fix up NetworkCapabilities' toString
...
Test: manual
Change-Id: I3bcec6a6873e8ec7ced0820d3d5b92249b19fe0a
2018-02-28 19:47:48 +09:00
Pavel Maltsev
013f8a445f
Merge "Add OEM_PAID network capability" am: 2501283064 am: 82fdea2d7b
...
am: 5cb05a12bd
2018-02-28 08:42:24 +00:00
Pavel Maltsev
5cb05a12bd
Merge "Add OEM_PAID network capability" am: 2501283064
...
am: 82fdea2d7b
2018-02-28 08:28:25 +00:00
Pavel Maltsev
82fdea2d7b
Merge "Add OEM_PAID network capability"
...
am: 2501283064
2018-02-28 08:14:48 +00:00
Treehugger Robot
2501283064
Merge "Add OEM_PAID network capability"
2018-02-28 07:06:00 +00:00
Andreas Gampe
5781efe42a
Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a am: a7c5afafe3
...
am: 0bf88228ca
2018-02-27 19:39:51 +00:00
Andreas Gampe
0bf88228ca
Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a
...
am: a7c5afafe3
2018-02-27 19:19:01 +00:00
Andreas Gampe
a7c5afafe3
Merge "Frameworks: Annotate JUnit4 test with @Test"
...
am: 4d9bec6b4a
Change-Id: I0c684a434a0f43fcae1a766c6c84a756115d9dcb
2018-02-27 19:07:49 +00:00
Andreas Gampe
94bb3f9b9e
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
d7fce6abbd
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
2b1592206b
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: cab3e6009c am: 4e2e3f823b
...
am: 3a5a4efd8a
2018-02-20 23:21:59 +00:00
nharold
3a5a4efd8a
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: cab3e6009c
...
am: 4e2e3f823b
2018-02-20 23:07:53 +00:00
nharold
4e2e3f823b
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
...
am: cab3e6009c
2018-02-20 22:55:38 +00:00
nharold
cab3e6009c
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
2018-02-20 19:17:23 +00:00
Chalard Jean
0bf8c2522a
Merge changes Ic28c5653,Ic635f97b am: 0ca21cfdfe am: a0402e1baa
...
am: a9b555cfa1
2018-02-19 08:36:01 +00:00
Chalard Jean
a9b555cfa1
Merge changes Ic28c5653,Ic635f97b am: 0ca21cfdfe
...
am: a0402e1baa
2018-02-19 08:24:47 +00:00
Chalard Jean
a0402e1baa
Merge changes Ic28c5653,Ic635f97b
...
am: 0ca21cfdfe
2018-02-19 08:14:19 +00:00
Chalard Jean
0bfcb6c5b2
Merge "Don't refcount TRACK_DEFAULT requests." am: 7207e1a65a am: 04c70248fb
...
am: e00ba2e603
2018-02-19 04:12:50 +00:00
Chalard Jean
e00ba2e603
Merge "Don't refcount TRACK_DEFAULT requests." am: 7207e1a65a
...
am: 04c70248fb
2018-02-19 04:01:17 +00:00
Chalard Jean
04c70248fb
Merge "Don't refcount TRACK_DEFAULT requests."
...
am: 7207e1a65a
2018-02-19 03:54:25 +00:00
Treehugger Robot
0ca21cfdfe
Merge changes Ic28c5653,Ic635f97b
...
* changes:
[LT2] Fix release request while lingering.
[LT1] Add a test for release request while lingering
2018-02-19 03:45:27 +00:00
Chalard Jean
7207e1a65a
Merge "Don't refcount TRACK_DEFAULT requests."
2018-02-19 02:13:48 +00:00
Chalard Jean
a23189f7e5
Merge "DO NOT MERGE : fix useless import" am: 67036aacbc -s ours am: 684228821c -s ours
...
am: 18131d6335
2018-02-19 02:01:41 +00:00
Chalard Jean
9f48d166f6
[LT2] Fix release request while lingering.
...
Test: runtest framework-net
Change-Id: Ic28c5653d16351903b792e76ba8b199b7ed1f8d4
2018-02-19 11:00:58 +09:00
Chalard Jean
18131d6335
Merge "DO NOT MERGE : fix useless import" am: 67036aacbc -s ours
...
am: 684228821c
2018-02-19 01:57:09 +00:00
Chalard Jean
684228821c
Merge "DO NOT MERGE : fix useless import"
...
am: 67036aacbc
2018-02-19 01:51:39 +00:00
Chalard Jean
67036aacbc
Merge "DO NOT MERGE : fix useless import"
2018-02-18 23:14:42 +00:00
Nathan Harold
0990bc8b57
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
Jeff Sharkey
6be9ee13d9
Merge "Better handling of NTP-based clocks."
2018-02-16 22:13:01 +00:00
Jeff Sharkey
af8f5f5ebc
Better handling of NTP-based clocks.
...
Now that we have a nice Clock abstraction, we can use it to represent
a clock backed by an NTP fix. (This makes testing logic much easier
to write.)
We now rely completely on NetworkTimeUpdateService to keep our NTP
fix up to date, instead of trying to refresh in the middle of
critical paths which could trigger random ANRs.
Add internal FallbackClock to make it easier to handle missing NTP
fixes. Add internal SimpleClock to let implementers focus on single
millis() method.
Test: bit FrameworksNetTests:com.android.server.net.NetworkStatsServiceTest
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 69714690, 72320957
Change-Id: Ic32cdcbe093d08b73b0e4b23d6910b23ea8e1968
Exempt-From-Owner-Approval: approved in previous PS
2018-02-16 22:11:35 +00:00
Benedict Wong
614a50d5d7
Merge "Correct bug in IpSecTransformTest" am: b05d401748 am: 4a52c1438a
...
am: fb006fa020
2018-02-16 20:51:37 +00:00
Benedict Wong
fb006fa020
Merge "Correct bug in IpSecTransformTest" am: b05d401748
...
am: 4a52c1438a
2018-02-16 20:43:12 +00:00
Benedict Wong
4a52c1438a
Merge "Correct bug in IpSecTransformTest"
...
am: b05d401748
2018-02-16 20:28:18 +00:00
Benedict Wong
b05d401748
Merge "Correct bug in IpSecTransformTest"
2018-02-16 18:32:05 +00:00
Chalard Jean
a7c93b0b5b
[LT1] Add a test for release request while lingering
...
Test: runtest framework-net
Change-Id: Ic635f97bf3dad8b695b3b8cc32c1a8b891166f9f
2018-02-16 18:09:42 +09:00
Chalard Jean
b0bf117861
Don't refcount TRACK_DEFAULT requests.
...
This has no concrete impact on the behavior of ConnectivityService,
but in principle TRACK_DEFAULT requests should not be counted toward
requests that make a network foreground. It does not have an impact
because only VPNs could be affected by this, and VPNs are always in
the foreground by definition.
Test: runtest frameworks-net
Test: cts
Change-Id: Id2ae6b5c9d542fe168e64ed713b6ec0a04062c82
2018-02-16 17:59:29 +09:00
Chalard Jean
31cbef1cbc
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
299e793837
Merge "Add missing'}' in javadoc of public API method" am: 8f22a42cf7 am: e7b8b95aa8
...
am: 8d2c7aa52b
2018-02-16 07:58:57 +00:00
Hugo Benichi
8d2c7aa52b
Merge "Add missing'}' in javadoc of public API method" am: 8f22a42cf7
...
am: e7b8b95aa8
2018-02-16 07:50:57 +00:00
Hugo Benichi
e7b8b95aa8
Merge "Add missing'}' in javadoc of public API method"
...
am: 8f22a42cf7
2018-02-16 07:43:08 +00:00
Treehugger Robot
8f22a42cf7
Merge "Add missing'}' in javadoc of public API method"
2018-02-16 03:19:35 +00:00
