Chalard Jean
ef6b974a62
Merge "Clarify documentation for getActiveNetworkInfo and friends" am: a47ebd7f70
...
am: fc45f0749c
2018-03-30 08:51:38 +00:00
Chalard Jean
fc45f0749c
Merge "Clarify documentation for getActiveNetworkInfo and friends"
...
am: a47ebd7f70
2018-03-30 08:36:58 +00:00
Chalard Jean
ba7a3467fd
Clarify documentation for getActiveNetworkInfo and friends
...
For VPNs it's unobvious what these methods do, so document that.
Bug: 70917007
Test: Comment changes only. Checkdoc passes.
Change-Id: I31ec1aea356d88d969eaf9fc7d8c2ed13ce924eb
2018-03-29 18:10:56 +09:00
Ricky Wai
a635ed5a99
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
...
am: 9bf657d1e7
2018-03-26 17:01:45 +00:00
Ricky Wai
9bf657d1e7
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
2018-03-26 16:46:20 +00:00
Chalard Jean
e9d037c6ef
Merge "Have the status bar listen to all macro-users VPN changes." am: b84083ae3b
...
am: cad715f0d8
2018-03-23 09:29:28 +00:00
TreeHugger Robot
55f0dd815d
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
cad715f0d8
Merge "Have the status bar listen to all macro-users VPN changes."
...
am: b84083ae3b
2018-03-23 09:22:36 +00:00
Chalard Jean
3234396b78
Merge "Have PermissionMonitor arbiter which app can access background networks"
...
am: c907d94361
2018-03-23 08:12:51 +00:00
Chalard Jean
b84083ae3b
Merge "Have the status bar listen to all macro-users VPN changes."
2018-03-23 07:33:02 +00:00
Chalard Jean
48bb6ede68
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
a43eede395
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
573dcabcff
Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc
...
Test: NULL
Bug: 74831039
Change-Id: I227ba1377a51821204cd5830e7da6ff3a15bca02
2018-03-22 20:13:05 +00:00
Chalard Jean
f8d5bd9441
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
06f604fcbd
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
be4e459af5
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
84eab7e76c
Merge "Fixing comments in Network Capabilities" am: d6da5146e7
...
am: fd41459278
2018-03-12 08:08:31 +00:00
Pavel Maltsev
fd41459278
Merge "Fixing comments in Network Capabilities"
...
am: d6da5146e7
2018-03-12 07:57:07 +00:00
Treehugger Robot
d6da5146e7
Merge "Fixing comments in Network Capabilities"
2018-03-12 07:42:58 +00:00
Pavel Maltsev
c30002742f
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
b295d028c8
Merge "Deprecate most of NetworkInfo." am: 12c57e795c
...
am: 94d7da3a7c
2018-03-09 13:12:08 +00:00
Chalard Jean
94d7da3a7c
Merge "Deprecate most of NetworkInfo."
...
am: 12c57e795c
2018-03-09 12:57:15 +00:00
Chalard Jean
5acb7b709a
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
28857b2a31
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
fbb48a210f
Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc
...
am: 6d8274ebf1
2018-03-07 23:09:04 +00:00
Pavel Maltsev
6d8274ebf1
Merge "Minor clean-up in NetworkCapabilities"
...
am: 98dc002acc
2018-03-07 23:00:53 +00:00
Treehugger Robot
98dc002acc
Merge "Minor clean-up in NetworkCapabilities"
2018-03-07 21:06:59 +00:00
Pavel Maltsev
07aeacfbd5
Merge "Extend network request to query networks w/o capabilites" am: 762a14565b am: 76136de729
...
am: 60bcd4b9d9
2018-03-03 00:14:52 +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
0c788ec3df
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32 am: e999899287
...
am: f6c1bf66ba
2018-03-02 13:25:02 +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
1618bad6e0
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: ef307293e5 am: 58c3355b8f
...
am: d98aec5eee
2018-03-02 12:54:29 +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
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
42016b3e96
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
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
1c8ffcfc46
Merge "Fix up NetworkCapabilities' toString" am: ef16e8daab am: 2e4c0bf13c
...
am: 7f245b1f71
2018-03-01 06:13:04 +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
f12177caec
Merge "Add OEM_PAID network capability" am: 230f251155 am: 35999ae101
...
am: fe1ed24e15
2018-02-28 08:42:24 +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
nharold
8974c107ae
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688 am: 4f00de4aad
...
am: 137c833e70
2018-02-20 23:21:59 +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
1da02e25a4
Merge "DO NOT MERGE : fix useless import"
2018-02-18 23:14:42 +00:00
