Pavel Maltsev
518c3decff
Merge "Add OEM_PAID capability to system api" into pi-dev
...
am: 62e4efeee2
Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
2018-03-30 18:30:23 +00:00
Jeff Sharkey
6c5e373f30
Merge "API council requested tweaks to NetworkRequest." into pi-dev
...
am: 66b0087e58
Change-Id: I0d090ebb7d57689a061badcf593ae9a37d88f7ce
2018-03-30 18:22:13 +00:00
Pavel Maltsev
62e4efeee2
Merge "Add OEM_PAID capability to system api" into pi-dev
2018-03-30 16:32:52 +00:00
Jeff Sharkey
66b0087e58
Merge "API council requested tweaks to NetworkRequest." into pi-dev
2018-03-30 16:30:24 +00:00
Paul Jensen
ef15944d4f
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
...
am: 4baa5d48e3
Change-Id: I2a2254ce65c2176ae0be1d6276034b1bb0cad987
2018-03-30 16:22:51 +00:00
Lorenzo Colitti
9e0b6ce895
Merge "Add Network.fromNetworkHandle()" into pi-dev
...
am: c0b767a937
Change-Id: I22e68ab29982690dee5b2c0c6e1fbd47df0b0326
2018-03-30 14:55:48 +00:00
TreeHugger Robot
4baa5d48e3
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
2018-03-30 09:47:51 +00:00
Lorenzo Colitti
1f594309aa
Merge "Mark networks with OEM_PAID always restricted" am: 99613ff80b
...
am: 88650629fa
Change-Id: I88500f6add4f1a6c8a77eb976a489c11c7dc5b6d
2018-03-30 09:05:09 +00:00
Chalard Jean
ef6b974a62
Merge "Clarify documentation for getActiveNetworkInfo and friends" am: a47ebd7f70
...
am: fc45f0749c
Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5
2018-03-30 08:51:38 +00:00
Lorenzo Colitti
88650629fa
Merge "Mark networks with OEM_PAID always restricted"
...
am: 99613ff80b
Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
2018-03-30 08:47:25 +00:00
Chalard Jean
fc45f0749c
Merge "Clarify documentation for getActiveNetworkInfo and friends"
...
am: a47ebd7f70
Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
2018-03-30 08:36:58 +00:00
TreeHugger Robot
7db624228a
Merge "Clarify documentation for getActiveNetworkInfo and friends" into pi-dev
2018-03-30 08:22:29 +00:00
Lorenzo Colitti
99613ff80b
Merge "Mark networks with OEM_PAID always restricted"
2018-03-30 07:00:54 +00:00
Pavel Maltsev
fa0f612d29
Mark networks with OEM_PAID always restricted
...
Bug: 68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3
2018-03-30 07:00:39 +00:00
Chalard Jean
7c85ba400c
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-30 12:22:06 +09:00
Paul Jensen
75184ed674
Fix socket leaks in various android.net.Network methods.
...
Bug: 72124526
Test: make CtsNetTestCases
Change-Id: I3398b67272360f894e01a8cdfbc47b17d77c2330
2018-03-29 07:43:01 -04:00
Paul Jensen
bcf88e4576
Add Network.fromNetworkHandle()
...
This is the counterpart to Network.getNetworkHandle() and facilitates
native code calling back to Java with network handle values from
getNetworkHandle.
Bug: 77210159
Bug: 64148938
Test: make CtsNetTestCases
Change-Id: I032b959d84180c063a79ddd97c35e7384b0f50a1
2018-03-29 07:24:59 -04: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
Jeff Sharkey
fc5a07fe83
API council requested tweaks to NetworkRequest.
...
If you put values into the Builder, you should be able to observe
those values on the built object.
Test: atest android.net.cts.NetworkRequestTest
Bug: 74945408
Change-Id: I9aacceb82c98f7881f0eb5e1106d89d469b816a7
2018-03-28 14:02:00 -06:00
Pavel Maltsev
0b2e0b0280
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
3585034ec9
Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc am: 6d8274ebf1
...
am: fbb48a210f
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
a635ed5a99
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
...
am: 9bf657d1e7
Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7
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
Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824
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
Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
2018-03-23 09:22:36 +00:00
Chalard Jean
3234396b78
Merge "Have PermissionMonitor arbiter which app can access background networks"
...
am: c907d94361
Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
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
Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4
2018-03-12 08:08:31 +00:00
Pavel Maltsev
fd41459278
Merge "Fixing comments in Network Capabilities"
...
am: d6da5146e7
Change-Id: Iacbcac2e740099ea6b6a6f7a646f046370fd16f5
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
Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1
2018-03-09 13:12:08 +00:00
Chalard Jean
94d7da3a7c
Merge "Deprecate most of NetworkInfo."
...
am: 12c57e795c
Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
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
Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c
2018-03-07 23:09:04 +00:00
Pavel Maltsev
6d8274ebf1
Merge "Minor clean-up in NetworkCapabilities"
...
am: 98dc002acc
Change-Id: Ic70f545a4886461f38f1af934600f4e1afe0179f
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
Change-Id: I3bf776767be61577f1bca0d98d4aaf82a0e45336
2018-03-03 00:14:52 +00:00
Pavel Maltsev
76136de729
Merge "Extend network request to query networks w/o capabilites"
...
am: 762a14565b
Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9
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
Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
2018-03-02 13:25:02 +00:00
Chalard Jean
e999899287
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
...
am: dce4d4ca32
Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
2018-03-02 13:10:45 +00:00