android-build-team Robot
08c9f8a915
Snap for 4670666 from b3029a4f72d884bc1931e372a0851a5fdfadf251 to pi-release
...
Change-Id: I38b91fc0587445a0fc1526b6fceacf159de94a4a
2018-03-22 07:25:10 +00:00
Nathan Harold
bfcc17cc20
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)
2018-03-20 18:29:02 -07:00
Benedict Wong
76df78ffbf
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)
2018-03-20 16:01:27 -07:00
android-build-team Robot
7f01b3fa8e
Snap for 4647811 from 7557234316248d886cafaedfa6c20297a8508688 to pi-release
...
Change-Id: I322dc50084bb8610c8fd196287a91365bbb8adfc
2018-03-11 08:24:47 +00:00
Chalard Jean
bf7610aa8a
Merge "Deprecate most of NetworkInfo." into pi-dev
2018-03-10 07:51:11 +00:00
Chalard Jean
7eaf3b10e5
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
2018-03-09 16:52:20 +09:00
Chad Brubaker
caced413da
Expose CONNECTIVITY_ACTION to Instant Apps
...
Test: Broadcast is visible to Instant Apps
Bug: 69421898
Change-Id: I8435e7723cf7a722668b97ff087d1f4453d3e7b7
2018-03-08 10:37:09 -08:00
android-build-team Robot
a276cdabe7
Snap for 4638586 from 1fff4c000de08c612bf7e69d4958a3fa3cc2e3c0 to pi-release
...
Change-Id: I212013556116b20424c936b35518b8e86ececc94
2018-03-07 08:22:20 +00:00
Andreas Gampe
85c8c3d822
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)
2018-03-07 11:36:57 +09:00
android-build-team Robot
8c8d2e675a
Snap for 4632767 from 9b5b015559141d2459a27e03f3764ce4a1225fc9 to pi-release
...
Change-Id: I8e9eb02bd231c35aac0244c9c8d652b08944de8a
2018-03-04 08:25:37 +00:00
Pavel Maltsev
1016f7327a
Merge "Extend network request to query networks w/o capabilites" am: 47d4d15483 am: 334cde1ec2
...
am: fa04c2d802
Change-Id: I3bf776767be61577f1bca0d98d4aaf82a0e45336
2018-03-03 00:14:52 +00:00
Pavel Maltsev
fa04c2d802
Merge "Extend network request to query networks w/o capabilites" am: 47d4d15483
...
am: 334cde1ec2
Change-Id: Ie0c4fa4648c235589fecd79a25d28f1e62025fb7
2018-03-03 00:03:37 +00:00
Pavel Maltsev
334cde1ec2
Merge "Extend network request to query networks w/o capabilites"
...
am: 47d4d15483
Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9
2018-03-02 23:52:18 +00:00
Treehugger Robot
47d4d15483
Merge "Extend network request to query networks w/o capabilites"
2018-03-02 19:04:31 +00:00
Chalard Jean
0a8dbc7886
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: faed85f2b0 am: 331e50f601
...
am: ec7c68cb2b
Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
2018-03-02 13:25:02 +00:00
Chalard Jean
ec7c68cb2b
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: faed85f2b0
...
am: 331e50f601
Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919
2018-03-02 13:17:23 +00:00
Chalard Jean
331e50f601
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
...
am: faed85f2b0
Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
2018-03-02 13:10:45 +00:00
Chalard Jean
562e154642
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: f477aedec5 am: 7506c131c1
...
am: 941de3f74c
Change-Id: Ifd77149ca2c45249b8776c878c6fac46ae81c2a4
2018-03-02 12:54:29 +00:00
Chalard Jean
941de3f74c
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: f477aedec5
...
am: 7506c131c1
Change-Id: I33c6fcc72753e00af601cf915aa78416174a3871
2018-03-02 12:46:46 +00:00
Chalard Jean
7506c131c1
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
...
am: f477aedec5
Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da
2018-03-02 12:34:25 +00:00
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
android-build-team Robot
56bbe5d03e
Snap for 4628106 from 3f1d0bb1a3 to pi-release
...
Change-Id: I868f63ab4bf15e4da74bfc2c92c33a6a42d440dc
2018-03-01 08:21:40 +00:00
Chalard Jean
3f1d0bb1a3
Merge "Fix up NetworkCapabilities' toString" am: a23d640426 am: 03580e0ccd
...
am: 26afb962f5
Change-Id: I3d3f3f34f30b69750e197b185c4e70bd360f35e0
2018-03-01 06:13:04 +00:00
Chalard Jean
26afb962f5
Merge "Fix up NetworkCapabilities' toString" am: a23d640426
...
am: 03580e0ccd
Change-Id: I2f1578589232c49574dbf401d7f4becfa350a1c0
2018-03-01 05:56:33 +00:00
Chalard Jean
03580e0ccd
Merge "Fix up NetworkCapabilities' toString"
...
am: a23d640426
Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518
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
Change-Id: Id64d288764dc5a556b60f5e3b866b40792647ac0
2018-02-28 08:42:24 +00:00
Pavel Maltsev
5cb05a12bd
Merge "Add OEM_PAID network capability" am: 2501283064
...
am: 82fdea2d7b
Change-Id: Ie0377fea66f784c910bd0a06f87543cc5cf82c84
2018-02-28 08:28:25 +00:00
android-build-team Robot
d2b6f10801
Snap for 4625912 from 7f884975141dae187e8e6bb136fd9002dc06e4b9 to pi-release
...
Change-Id: I00dc0c4ef5ef14678397e177e7796a1d167a5b2b
2018-02-28 08:22:58 +00:00
Pavel Maltsev
82fdea2d7b
Merge "Add OEM_PAID network capability"
...
am: 2501283064
Change-Id: I2fb8825bc1038783ef45907846b52192b6fe5d18
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
Change-Id: I0c611c22eedda2d849bd16ef2e2bb7e2e60e0a5a
2018-02-27 19:39:51 +00:00
Andreas Gampe
0bf88228ca
Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a
...
am: a7c5afafe3
Change-Id: I70e11136f6e261cccf4ce57f757f97999f74b402
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
android-build-team Robot
02934987b8
Snap for 4620899 from 55a3fe78c3f642c873193c4fd1cf2fcc1849ea55 to pi-release
...
Change-Id: Id2dd2991781763dd72552cc35ffb13b7f896a8d6
2018-02-25 08:29:09 +00: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
android-build-team Robot
4a1ab81eba
Snap for 4613997 from 437680c4ff4a33c7377b22cc39209561ae2e3b55 to pi-release
...
Change-Id: I8ca0d874808c26cde3f0cf883e05dca5f90784b5
2018-02-21 08:20:38 +00:00
nharold
2b1592206b
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: cab3e6009c am: 4e2e3f823b
...
am: 3a5a4efd8a
Change-Id: I2ce9d740b82f591b847150ec1eaffa39bfbd0241
2018-02-20 23:21:59 +00:00
nharold
3a5a4efd8a
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: cab3e6009c
...
am: 4e2e3f823b
Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157
2018-02-20 23:07:53 +00:00
nharold
4e2e3f823b
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
...
am: cab3e6009c
Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c
2018-02-20 22:55:38 +00:00
nharold
cab3e6009c
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
2018-02-20 19:17:23 +00:00
android-build-team Robot
ffbb55127c
Snap for 4612226 from d9cbff71867c0b4d3023d944d6f8b71b83e8ce37 to pi-release
...
Change-Id: I976cf4c7975b106592e45a1b8474124064fa5100
2018-02-20 08:26:37 +00:00
Chalard Jean
0bf8c2522a
Merge changes Ic28c5653,Ic635f97b am: 0ca21cfdfe am: a0402e1baa
...
am: a9b555cfa1
Change-Id: Ieea9917b3a68e08686c74ebf39e5fed61f641a7a
2018-02-19 08:36:01 +00:00
Chalard Jean
a9b555cfa1
Merge changes Ic28c5653,Ic635f97b am: 0ca21cfdfe
...
am: a0402e1baa
Change-Id: I6596fae1946bffade125a14b3bd095eda557a7a5
2018-02-19 08:24:47 +00:00