Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc
...
Test: NULL
Bug: 74831039
Change-Id: I227ba1377a51821204cd5830e7da6ff3a15bca02
Ricky Wai
commited 2018-03-22 20:13:05 +00:00
573dcabcff
Check mOwnedByTransform to avoid DELSA on SPI
...
The owned by transform flag prevents the removal
of an SPI from accidentally deleting an associated
SA in the kernel. That flag wasn't actually being
checked, so deleting an SPI would result in the
transform being removed.
The existing code already guarantees that the SA is
deleted when the transform is deleted
Bug: 73258845
Test: runtest frameworks-net
Merged-In: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
Change-Id: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
(cherry picked from commit 22795302be4ec35449908cf566aa7c16945df836)
Nathan Harold
commited 2018-03-20 18:29:02 -07:00
75e48d2435
Added implementation for VTI add/remove address
...
This change adds implementation details for add/remove addresses onto a
VTI.
Bug: 73675031
Test: New tests added, passing on Walleye
Merged-In: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
(cherry picked from commit ecc9f7cc08804e3fa15fea04ae94ea1bc74edbfe)
Benedict Wong
authored and
Nathan Harold
commited 2018-03-20 16:01:27 -07:00
8520015095
Merge "Deprecate most of NetworkInfo." into pi-dev
Chalard Jean
authored and
Android (Google) Code Review
commited 2018-03-10 07:51:11 +00:00
c0c8a768a7
Deprecate most of NetworkInfo.
...
getType, getTypeName, isConnectedOrConnecting, isConnected,
isAvaisable, isFailover, isRoaming, getState, getDetailedState,
getReason, and the TYPE_* constants in ConnectivityManager
along with methods that use them are now stacked on a boat
bound for the other side of the Styx.
Test: no code changes
Bug: 62844794
Change-Id: Idd70763de5b1af5580b4734cd443ac4b570069cc
Chalard Jean
commited 2018-03-09 16:52:20 +09:00
5acb7b709a
Expose CONNECTIVITY_ACTION to Instant Apps
...
Test: Broadcast is visible to Instant Apps
Bug: 69421898
Change-Id: I8435e7723cf7a722668b97ff087d1f4453d3e7b7
Chad Brubaker
commited 2018-03-08 10:37:09 -08:00
88a4e80cf0
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)
Andreas Gampe
authored and
Erik Kline
commited 2018-03-07 11:36:57 +09:00
32323983bf
Merge "Extend network request to query networks w/o capabilites" am: 762a14565b am: 76136de729
...
am: 60bcd4b9d9
Change-Id: I3bf776767be61577f1bca0d98d4aaf82a0e45336
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-03 00:14:52 +00:00
07aeacfbd5
Merge "Extend network request to query networks w/o capabilites" am: 762a14565b
...
am: 76136de729
Change-Id: Ie0c4fa4648c235589fecd79a25d28f1e62025fb7
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-03 00:03:37 +00:00
60bcd4b9d9
Merge "Extend network request to query networks w/o capabilites"
...
am: 762a14565b
Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-02 23:52:18 +00:00
76136de729
Merge "Extend network request to query networks w/o capabilites"
Treehugger Robot
authored and
Gerrit Code Review
commited 2018-03-02 19:04:31 +00:00
762a14565b
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32 am: e999899287
...
am: f6c1bf66ba
Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
Chalard Jean
authored and
android-build-merger
commited 2018-03-02 13:25:02 +00:00
0c788ec3df
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32
...
am: e999899287
Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919
Chalard Jean
authored and
android-build-merger
commited 2018-03-02 13:17:23 +00:00
f6c1bf66ba
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
...
am: dce4d4ca32
Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
Chalard Jean
authored and
android-build-merger
commited 2018-03-02 13:10:45 +00:00
e999899287
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: ef307293e5 am: 58c3355b8f
...
am: d98aec5eee
Change-Id: Ifd77149ca2c45249b8776c878c6fac46ae81c2a4
Chalard Jean
authored and
android-build-merger
commited 2018-03-02 12:54:29 +00:00
1618bad6e0
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: ef307293e5
...
am: 58c3355b8f
Change-Id: I33c6fcc72753e00af601cf915aa78416174a3871
Chalard Jean
authored and
android-build-merger
commited 2018-03-02 12:46:46 +00:00
d98aec5eee
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
...
am: ef307293e5
Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da
Chalard Jean
authored and
android-build-merger
commited 2018-03-02 12:34:25 +00:00
58c3355b8f
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-02 11:52:15 +00:00
dce4d4ca32
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-02 11:18:10 +00:00
ef307293e5
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
Chalard Jean
commited 2018-03-02 17:10:11 +09:00
8895306c4a
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
Chalard Jean
commited 2018-03-02 16:20:22 +09:00
687546ed4d
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
Pavel Maltsev
commited 2018-03-01 17:52:02 -08:00
40ba60c765
Merge "Fix up NetworkCapabilities' toString" am: ef16e8daab am: 2e4c0bf13c
...
am: 7f245b1f71
Change-Id: I3d3f3f34f30b69750e197b185c4e70bd360f35e0
Chalard Jean
authored and
android-build-merger
commited 2018-03-01 06:13:04 +00:00
1c8ffcfc46
Merge "Fix up NetworkCapabilities' toString" am: ef16e8daab
...
am: 2e4c0bf13c
Change-Id: I2f1578589232c49574dbf401d7f4becfa350a1c0
Chalard Jean
authored and
android-build-merger
commited 2018-03-01 05:56:33 +00:00
7f245b1f71
Merge "Fix up NetworkCapabilities' toString"
...
am: ef16e8daab
Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518
Chalard Jean
authored and
android-build-merger
commited 2018-03-01 05:48:14 +00:00
2e4c0bf13c
Merge "Fix up NetworkCapabilities' toString"
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-01 04:01:16 +00:00
ef16e8daab
Fix up NetworkCapabilities' toString
...
Test: manual
Change-Id: I3bcec6a6873e8ec7ced0820d3d5b92249b19fe0a
Chalard Jean
commited 2018-02-28 19:47:48 +09:00
8337e58db2
Merge "Add OEM_PAID network capability" am: 230f251155 am: 35999ae101
...
am: fe1ed24e15
Change-Id: Id64d288764dc5a556b60f5e3b866b40792647ac0
Pavel Maltsev
authored and
android-build-merger
commited 2018-02-28 08:42:24 +00:00
f12177caec
Merge "Add OEM_PAID network capability" am: 230f251155
...
am: 35999ae101
Change-Id: Ie0377fea66f784c910bd0a06f87543cc5cf82c84
Pavel Maltsev
authored and
android-build-merger
commited 2018-02-28 08:28:25 +00:00
fe1ed24e15
Merge "Add OEM_PAID network capability"
...
am: 230f251155
Change-Id: I2fb8825bc1038783ef45907846b52192b6fe5d18
Pavel Maltsev
authored and
android-build-merger
commited 2018-02-28 08:14:48 +00:00
35999ae101
Merge "Add OEM_PAID network capability"
Treehugger Robot
authored and
Gerrit Code Review
commited 2018-02-28 07:06:00 +00:00
230f251155
Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a am: 3a3bcf699f
...
am: 19a31611ce
Change-Id: I0c611c22eedda2d849bd16ef2e2bb7e2e60e0a5a
Andreas Gampe
authored and
android-build-merger
commited 2018-02-27 19:39:51 +00:00
f45323be96
Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a
...
am: 3a3bcf699f
Change-Id: I70e11136f6e261cccf4ce57f757f97999f74b402
Andreas Gampe
authored and
android-build-merger
commited 2018-02-27 19:19:01 +00:00
19a31611ce
Merge "Frameworks: Annotate JUnit4 test with @Test"
...
am: 4d9bec6b4a
Change-Id: I0c684a434a0f43fcae1a766c6c84a756115d9dcb
Andreas Gampe
authored and
android-build-merger
commited 2018-02-27 19:07:49 +00:00
3a3bcf699f
Frameworks: Annotate JUnit4 test with @Test
...
Mollify Errorprone.
Bug: 72076216
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest IpSecServiceParameterizedTest
Change-Id: Ia3a253c4c5994937efc0f498ac047c5fb4eee3e9
Andreas Gampe
commited 2018-02-26 08:09:26 -08:00
71510464df
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
Jeff Sharkey
commited 2018-02-23 16:27:39 +00:00
c80b318dae
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688 am: 4f00de4aad
...
am: 137c833e70
Change-Id: I2ce9d740b82f591b847150ec1eaffa39bfbd0241
nharold
authored and
android-build-merger
commited 2018-02-20 23:21:59 +00:00
8974c107ae
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688
...
am: 4f00de4aad
Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157
nharold
authored and
android-build-merger
commited 2018-02-20 23:07:53 +00:00
137c833e70
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
...
am: f6bbc21688
Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c
nharold
authored and
android-build-merger
commited 2018-02-20 22:55:38 +00:00
4f00de4aad
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
nharold
authored and
Gerrit Code Review
commited 2018-02-20 19:17:23 +00:00
f6bbc21688
Merge changes Ic28c5653,Ic635f97b am: ba40cd6083 am: 5d82ce61c4
...
am: 21a3501037
Change-Id: Ieea9917b3a68e08686c74ebf39e5fed61f641a7a
Chalard Jean
authored and
android-build-merger
commited 2018-02-19 08:36:01 +00:00
856f0a7d85
Merge changes Ic28c5653,Ic635f97b am: ba40cd6083
...
am: 5d82ce61c4
Change-Id: I6596fae1946bffade125a14b3bd095eda557a7a5
Chalard Jean
authored and
android-build-merger
commited 2018-02-19 08:24:47 +00:00
21a3501037
Merge changes Ic28c5653,Ic635f97b
...
am: ba40cd6083
Change-Id: I38218d8652ec36f2ea076a6806df883a9c9636de
Chalard Jean
authored and
android-build-merger
commited 2018-02-19 08:14:19 +00:00
5d82ce61c4
Merge "Don't refcount TRACK_DEFAULT requests." am: 5be0159188 am: 0f0f42cf2a
...
am: aedde0d17b
Change-Id: Ic2b19e9f3f7d8f67cc5854688e5e14ca2a419e66
Chalard Jean
authored and
android-build-merger
commited 2018-02-19 04:12:50 +00:00
8b7cf2ddec
Merge "Don't refcount TRACK_DEFAULT requests." am: 5be0159188
...
am: 0f0f42cf2a
Change-Id: Ib3e0e89a9d80546fbf3555cfdf715f2bd8e4ab94
Chalard Jean
authored and
android-build-merger
commited 2018-02-19 04:01:17 +00:00
aedde0d17b
Merge "Don't refcount TRACK_DEFAULT requests."
...
am: 5be0159188
Change-Id: I094ad8f9764f5cd657e2fe98c846710c8d241b64
Chalard Jean
authored and
android-build-merger
commited 2018-02-19 03:54:25 +00:00
0f0f42cf2a
Merge changes Ic28c5653,Ic635f97b
...
* changes:
[LT2] Fix release request while lingering.
[LT1] Add a test for release request while lingering
Treehugger Robot
authored and
Gerrit Code Review
commited 2018-02-19 03:45:27 +00:00
ba40cd6083
Merge "Don't refcount TRACK_DEFAULT requests."
Chalard Jean
authored and
Gerrit Code Review
commited 2018-02-19 02:13:48 +00:00
5be0159188
Merge "DO NOT MERGE : fix useless import" am: 1da02e25a4 -s ours am: 2ed0569b88 -s ours
...
am: b861cdd0ac -s ours
Change-Id: I7277bdc2fe3340c01004cd0ec3d4fbee25ffee69
Chalard Jean
authored and
android-build-merger
commited 2018-02-19 02:01:41 +00:00
e948208a97
[LT2] Fix release request while lingering.
...
Test: runtest framework-net
Change-Id: Ic28c5653d16351903b792e76ba8b199b7ed1f8d4
Chalard Jean
commited 2018-02-19 11:00:58 +09:00
6c8ee08f04