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
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
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
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
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
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
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
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
Chalard Jean
21a3501037
Merge changes Ic28c5653,Ic635f97b am: ba40cd6083
...
am: 5d82ce61c4
2018-02-19 08:24:47 +00:00
Chalard Jean
5d82ce61c4
Merge changes Ic28c5653,Ic635f97b
...
am: ba40cd6083
2018-02-19 08:14:19 +00:00
Chalard Jean
aedde0d17b
Merge "Don't refcount TRACK_DEFAULT requests." am: 5be0159188
...
am: 0f0f42cf2a
2018-02-19 04:01:17 +00:00
Chalard Jean
0f0f42cf2a
Merge "Don't refcount TRACK_DEFAULT requests."
...
am: 5be0159188
2018-02-19 03:54:25 +00:00
Treehugger Robot
ba40cd6083
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
5be0159188
Merge "Don't refcount TRACK_DEFAULT requests."
2018-02-19 02:13:48 +00:00
Chalard Jean
6c8ee08f04
[LT2] Fix release request while lingering.
...
Test: runtest framework-net
Change-Id: Ic28c5653d16351903b792e76ba8b199b7ed1f8d4
2018-02-19 11:00:58 +09:00
Chalard Jean
b861cdd0ac
Merge "DO NOT MERGE : fix useless import" am: 1da02e25a4 -s ours
...
am: 2ed0569b88
2018-02-19 01:57:09 +00:00
Chalard Jean
2ed0569b88
Merge "DO NOT MERGE : fix useless import"
...
am: 1da02e25a4
2018-02-19 01:51:39 +00:00
Chalard Jean
1da02e25a4
Merge "DO NOT MERGE : fix useless import"
2018-02-18 23:14:42 +00:00
Nathan Harold
e8ae0ebed3
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
Benedict Wong
6c5785160d
Merge "Correct bug in IpSecTransformTest" am: 99e01bc44d
...
am: 97b59dca81
2018-02-16 20:43:12 +00:00
Benedict Wong
97b59dca81
Merge "Correct bug in IpSecTransformTest"
...
am: 99e01bc44d
2018-02-16 20:28:18 +00:00
Benedict Wong
99e01bc44d
Merge "Correct bug in IpSecTransformTest"
2018-02-16 18:32:05 +00:00
Chalard Jean
03a2fd1c26
[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
3c4c8cf5cf
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
a3e497c580
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
ede2444697
Merge "Add missing'}' in javadoc of public API method" am: 21c11c37b1
...
am: e7c45d2c8a
2018-02-16 07:50:57 +00:00
Hugo Benichi
e7c45d2c8a
Merge "Add missing'}' in javadoc of public API method"
...
am: 21c11c37b1
2018-02-16 07:43:08 +00:00
Treehugger Robot
21c11c37b1
Merge "Add missing'}' in javadoc of public API method"
2018-02-16 03:19:35 +00:00
Benedict Wong
f430c89e18
Correct bug in IpSecTransformTest
...
testCreateTransformsWithSameConfigEqual used assertFalse rather than
assertTrue
Bug: 69385347
Test: Passing on walleye
Change-Id: I8caa26e184e8bfc3e8acc9061d85c22d27ebf448
2018-02-15 18:52:07 -08:00
Pavel Maltsev
3d5e45dc38
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
3ea90e3152
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: bc388ae1a9
...
am: d6b4143b67
2018-02-15 13:09:26 +00:00
Chalard Jean
d6b4143b67
Merge changes I3d68dbf8,I6ea524bb,I978d9119
...
am: bc388ae1a9
2018-02-15 12:57:16 +00:00
Chalard Jean
bc388ae1a9
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
