Pavel Maltsev
1868811e8f
Add OEM_PAID capability to system api
...
Some system apps should be able to request OEM_PAID networks. This
makes a lot of sense when Android is used as in-vehicle infotainment
systems.
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ic916de7522a9f803a2410bc4e3e82101fd9d0dbd
2018-03-27 23:17:14 -07:00
Pavel Maltsev
51f4d8a11d
Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df
...
am: 8a956a5141
Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380
(cherry picked from commit feb8d1498a822730e29cf346fe3382e3f5293a58)
2018-03-27 22:45:49 +00:00
Ricky Wai
24c776f0c4
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
...
am: 2ce1e6ce2a
Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7
2018-03-26 17:01:45 +00:00
Ricky Wai
2ce1e6ce2a
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
2018-03-26 16:46:20 +00:00
Chalard Jean
cc097d159f
Merge "Have the status bar listen to all macro-users VPN changes." am: 90988528c3
...
am: cdb95af156
Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824
2018-03-23 09:29:28 +00:00
TreeHugger Robot
749299b1c5
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
2018-03-23 09:26:46 +00:00
Chalard Jean
cdb95af156
Merge "Have the status bar listen to all macro-users VPN changes."
...
am: 90988528c3
Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
2018-03-23 09:22:36 +00:00
Chalard Jean
3f05f98daa
Merge "Have PermissionMonitor arbiter which app can access background networks"
...
am: 433c0e652f
Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
2018-03-23 08:12:51 +00:00
Chalard Jean
90988528c3
Merge "Have the status bar listen to all macro-users VPN changes."
2018-03-23 07:33:02 +00:00
Chalard Jean
d7a649f8fc
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
...
am: 1f654aa247
Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01
2018-03-23 06:48:49 +00:00
Chalard Jean
38354d1f60
Have PermissionMonitor arbiter which app can access background networks
...
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug: 67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-23 13:37:56 +09:00
Ricky Wai
04baf117bf
Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc
...
Test: NULL
Bug: 74831039
Change-Id: I227ba1377a51821204cd5830e7da6ff3a15bca02
2018-03-22 20:13:05 +00:00
Chalard Jean
e64b8d7bce
Have PermissionMonitor arbiter which app can access background networks
...
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug: 67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-22 19:03:59 +09:00
Chalard Jean
7c74b9f311
Have the status bar listen to all macro-users VPN changes.
...
Bug: 73217368
Test: manual
Using Datally on work profile. Before this, enabling the VPN
does not show the key icon. After this it does.
Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445
2018-03-22 13:25:52 +09:00
Chalard Jean
088588d3fb
Have the status bar listen to all macro-users VPN changes.
...
Bug: 73217368
Test: manual
Using Datally on work profile. Before this, enabling the VPN
does not show the key icon. After this it does.
Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445
2018-03-22 13:25:09 +09:00
Pavel Maltsev
3152f214df
Merge "Fixing comments in Network Capabilities" am: b6477d22ca
...
am: 2c36870f3d
Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4
2018-03-12 08:08:31 +00:00
Pavel Maltsev
2c36870f3d
Merge "Fixing comments in Network Capabilities"
...
am: b6477d22ca
Change-Id: Iacbcac2e740099ea6b6a6f7a646f046370fd16f5
2018-03-12 07:57:07 +00:00
Treehugger Robot
b6477d22ca
Merge "Fixing comments in Network Capabilities"
2018-03-12 07:42:58 +00:00
Pavel Maltsev
1f9f48e1c4
Fixing comments in Network Capabilities
...
Clean up after aosp/606338
Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891
2018-03-09 10:42:32 -08:00
Chalard Jean
17a24cb956
Merge "Deprecate most of NetworkInfo." am: 58ae164c97
...
am: 97aaa25bf0
Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1
2018-03-09 13:12:08 +00:00
Chalard Jean
97aaa25bf0
Merge "Deprecate most of NetworkInfo."
...
am: 58ae164c97
Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
2018-03-09 12:57:15 +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
Chalard Jean
e15d4ceee3
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 15:38:25 +09:00
Pavel Maltsev
5d97ad9fe4
Merge "Minor clean-up in NetworkCapabilities" am: 1dd43b192c
...
am: 6ab3c9c246
Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c
2018-03-07 23:09:04 +00:00
Pavel Maltsev
6ab3c9c246
Merge "Minor clean-up in NetworkCapabilities"
...
am: 1dd43b192c
Change-Id: Ic70f545a4886461f38f1af934600f4e1afe0179f
2018-03-07 23:00:53 +00:00
Treehugger Robot
1dd43b192c
Merge "Minor clean-up in NetworkCapabilities"
2018-03-07 21:06:59 +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
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
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
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
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
15e839f111
Minor clean-up in NetworkCapabilities
...
Follow up clean up for aosp/606338
Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I2d2cfeb51caaa339602f7d97ffffed6e4cfad432
2018-03-01 18:06:25 -08: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
Change-Id: I3d3f3f34f30b69750e197b185c4e70bd360f35e0
2018-03-01 06:13:04 +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
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
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
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
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