Merge "Add hasUnwantedCapability method" into pi-dev
...
am: 3d735d02d6
Pavel Maltsev
authored and
android-build-merger
commited 2018-04-04 10:15:10 -07:00
9c8a869f02
Merge "Add hasUnwantedCapability method" into pi-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2018-04-04 16:55:14 +00:00
3d735d02d6
Mark networks with OEM_PAID always restricted
...
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Cherry-picked from AOSP with no conflicts
Merged-in: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
Change-Id: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
(cherry picked from commit efbacc0ccb70917b2782272e6b8f1a0fb3f56cbe)
Lorenzo Colitti
authored and
Pavel Maltsev
commited 2018-04-04 05:35:54 +00:00
9b58dd356c
Merge "Make addUnwantedCapability method public" into pi-dev
...
am: 95f4b59348
Pavel Maltsev
authored and
android-build-merger
commited 2018-04-02 21:47:22 +00:00
2f3f53ee19
Add hasUnwantedCapability method
...
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
Bug: 72828388
Change-Id: Ib4026b8d7370d570f1b606f0d221d00fed6e787d
Pavel Maltsev
commited 2018-04-02 11:10:13 -07:00
a389a03bd5
Merge "Make addUnwantedCapability method public" into pi-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2018-04-02 15:07:25 +00:00
95f4b59348
Merge "Add OEM_PAID capability to system api" into pi-dev
...
am: 07019bb20f
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-30 18:30:23 +00:00
5e5bc33153
Merge "API council requested tweaks to NetworkRequest." into pi-dev
...
am: 93fc2b5049
Jeff Sharkey
authored and
android-build-merger
commited 2018-03-30 18:22:13 +00:00
c798269988
Merge "Add OEM_PAID capability to system api" into pi-dev
Pavel Maltsev
authored and
Android (Google) Code Review
commited 2018-03-30 16:32:52 +00:00
07019bb20f
Merge "API council requested tweaks to NetworkRequest." into pi-dev
Jeff Sharkey
authored and
Android (Google) Code Review
commited 2018-03-30 16:30:24 +00:00
93fc2b5049
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
...
am: f26c5341a5
Paul Jensen
authored and
android-build-merger
commited 2018-03-30 16:22:51 +00:00
fffa078935
Merge "Add Network.fromNetworkHandle()" into pi-dev
...
am: c0b767a937
Change-Id: I22e68ab29982690dee5b2c0c6e1fbd47df0b0326
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 14:55:48 +00:00
729b3b5f1f
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2018-03-30 09:47:51 +00:00
f26c5341a5
Merge "Mark networks with OEM_PAID always restricted" am: dbc568ceaf
...
am: e019e0e240
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 09:05:09 +00:00
3754e152e7
Merge "Clarify documentation for getActiveNetworkInfo and friends" am: b1016fbf14
...
am: bc4e495705
Chalard Jean
authored and
android-build-merger
commited 2018-03-30 08:51:38 +00:00
24b861fa74
Merge "Mark networks with OEM_PAID always restricted"
...
am: dbc568ceaf
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 08:47:25 +00:00
e019e0e240
Merge "Clarify documentation for getActiveNetworkInfo and friends"
...
am: b1016fbf14
Chalard Jean
authored and
android-build-merger
commited 2018-03-30 08:36:58 +00:00
bc4e495705
Merge "Clarify documentation for getActiveNetworkInfo and friends" into pi-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2018-03-30 08:22:29 +00:00
039947df6a
Merge "Mark networks with OEM_PAID always restricted"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2018-03-30 07:00:54 +00:00
dbc568ceaf
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
Pavel Maltsev
authored and
Lorenzo Colitti
commited 2018-03-30 07:00:39 +00:00
8cb5245570
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
Chalard Jean
commited 2018-03-30 12:22:06 +09:00
96d10a75b6
Fix socket leaks in various android.net.Network methods.
...
Bug: 72124526
Test: make CtsNetTestCases
Change-Id: I3398b67272360f894e01a8cdfbc47b17d77c2330
Paul Jensen
commited 2018-03-29 07:43:01 -04:00
55eaa09f96
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
Paul Jensen
commited 2018-03-29 07:24:59 -04:00
b895ac0fe6
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
Chalard Jean
commited 2018-03-29 18:10:56 +09:00
33703ef8a7
Make addUnwantedCapability method public
...
Allow apps to specify a list of capabilities that network must not have
in order to satisfy the request.
Bug: 72828388
Test: m -j
Change-Id: I91ee54963f7b92899c7a107b3a450b268c62fd8d
Pavel Maltsev
commited 2018-03-28 15:09:50 -07:00
089fe77ba7
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
Jeff Sharkey
commited 2018-03-28 14:02:00 -06:00
e5886f37ec
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
Pavel Maltsev
commited 2018-03-27 23:17:14 -07:00
1868811e8f
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)
Pavel Maltsev
commited 2018-03-27 22:45:49 +00:00
51f4d8a11d
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
...
am: 2ce1e6ce2a
Ricky Wai
authored and
android-build-merger
commited 2018-03-26 17:01:45 +00:00
24c776f0c4
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
Ricky Wai
authored and
Android (Google) Code Review
commited 2018-03-26 16:46:20 +00:00
2ce1e6ce2a
Merge "Have the status bar listen to all macro-users VPN changes." am: 90988528c3
...
am: cdb95af156
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 09:29:28 +00:00
cc097d159f
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2018-03-23 09:26:46 +00:00
749299b1c5
Merge "Have the status bar listen to all macro-users VPN changes."
...
am: 90988528c3
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 09:22:36 +00:00
cdb95af156
Merge "Have PermissionMonitor arbiter which app can access background networks"
...
am: 433c0e652f
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 08:12:51 +00:00
3f05f98daa
Merge "Have the status bar listen to all macro-users VPN changes."
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-23 07:33:02 +00:00
90988528c3
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
...
am: 1f654aa247
Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 06:48:49 +00:00
d7a649f8fc
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
Chalard Jean
commited 2018-03-23 13:37:56 +09:00
38354d1f60
Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc
...
Test: NULL
Bug: 74831039
Change-Id: I227ba1377a51821204cd5830e7da6ff3a15bca02
Ricky Wai
commited 2018-03-22 20:13:05 +00:00
04baf117bf
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
Chalard Jean
commited 2018-03-22 19:03:59 +09:00
e64b8d7bce
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
Chalard Jean
commited 2018-03-22 13:25:52 +09:00
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
Chalard Jean
commited 2018-03-22 13:25:09 +09:00
088588d3fb
Merge "Fixing comments in Network Capabilities" am: b6477d22ca
...
am: 2c36870f3d
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-12 08:08:31 +00:00
3152f214df
Merge "Fixing comments in Network Capabilities"
...
am: b6477d22ca
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-12 07:57:07 +00:00
2c36870f3d
Merge "Fixing comments in Network Capabilities"
Treehugger Robot
authored and
Gerrit Code Review
commited 2018-03-12 07:42:58 +00:00
b6477d22ca
Fixing comments in Network Capabilities
...
Clean up after aosp/606338
Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891
Pavel Maltsev
commited 2018-03-09 10:42:32 -08:00
1f9f48e1c4
Merge "Deprecate most of NetworkInfo." am: 58ae164c97
...
am: 97aaa25bf0
Chalard Jean
authored and
android-build-merger
commited 2018-03-09 13:12:08 +00:00
17a24cb956
Merge "Deprecate most of NetworkInfo."
...
am: 58ae164c97
Chalard Jean
authored and
android-build-merger
commited 2018-03-09 12:57:15 +00:00
97aaa25bf0
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
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
Chalard Jean
commited 2018-03-09 15:38:25 +09:00
e15d4ceee3
Merge "Minor clean-up in NetworkCapabilities" am: 1dd43b192c
...
am: 6ab3c9c246
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-07 23:09:04 +00:00
5d97ad9fe4
Pavel Maltsev
authored and
android-build-merger
commited 
TreeHugger Robot
authored and
Android (Google) Code Review
commited 
Lorenzo Colitti
authored and
Jeff Sharkey
authored and
Paul Jensen
authored and
Chalard Jean
authored and
Gerrit Code Review
commited 
Jeff Sharkey
commited 
Ricky Wai
authored and