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
Chalard Jean
856f0a7d85
Merge changes Ic28c5653,Ic635f97b am: ba40cd6083 am: 5d82ce61c4
...
am: 21a3501037
2018-02-19 08:36:01 +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
8b7cf2ddec
Merge "Don't refcount TRACK_DEFAULT requests." am: 5be0159188 am: 0f0f42cf2a
...
am: aedde0d17b
2018-02-19 04:12:50 +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
e948208a97
Merge "DO NOT MERGE : fix useless import" am: 1da02e25a4 -s ours am: 2ed0569b88 -s ours
...
am: b861cdd0ac
2018-02-19 02:01:41 +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
Jeff Sharkey
b46d9af7fa
Merge "Better handling of NTP-based clocks."
2018-02-16 22:13:01 +00:00
Jeff Sharkey
4b25261e91
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
764736f64b
Merge "Correct bug in IpSecTransformTest" am: 99e01bc44d am: 97b59dca81
...
am: 6c5785160d
2018-02-16 20:51:37 +00: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
51443b3817
Merge "Add missing'}' in javadoc of public API method" am: 21c11c37b1 am: e7c45d2c8a
...
am: ede2444697
2018-02-16 07:58:57 +00: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
4bb2e013fa
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: bc388ae1a9 am: d6b4143b67
...
am: 3ea90e3152
2018-02-15 14:23:57 +00: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
Benedict Wong
a9cb58eb73
Merge "Copy IpSecConfig when IpSecTransforms are created" am: 2c8456b22e am: 7d843254b8
...
am: ba6e5dc1d2
2018-02-15 06:01:49 +00:00
Benedict Wong
ba6e5dc1d2
Merge "Copy IpSecConfig when IpSecTransforms are created" am: 2c8456b22e
...
am: 7d843254b8
2018-02-14 21:25:08 +00:00
Benedict Wong
7d843254b8
Merge "Copy IpSecConfig when IpSecTransforms are created"
...
am: 2c8456b22e
Change-Id: I24ac6baa0492a46bf5810bc6bc146d9aaa9eccab
2018-02-14 21:14:19 +00:00
Chalard Jean
ae2424a97b
Deprecate CONNECTIVITY_ACTION.
...
That was its destiny.
Use NetworkCallbacks instead.
Test: runtest frameworks-net, but this is only doc changes
Change-Id: I3d68dbf817de92c66d899a7cc4519c5639e4c049
2018-02-14 15:14:44 +09:00
