Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Merge "Have the status bar listen to all macro-users VPN changes." am: b84083ae3b
am: cad715f0d8

Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824

Chalard Jean   authored and   android-build-merger   commited 2018-03-23 09:29:28 +00:00
e9d037c6ef
Merge "Have the status bar listen to all macro-users VPN changes."
am: b84083ae3b

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e

Chalard Jean   authored and   android-build-merger   commited 2018-03-23 09:22:36 +00:00
cad715f0d8
Merge "Have PermissionMonitor arbiter which app can access background networks"
am: c907d94361

Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2

Chalard Jean   authored and   android-build-merger   commited 2018-03-23 08:12:51 +00:00
3234396b78
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
b84083ae3b
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
48bb6ede68
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
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

Chalard Jean   commited 2018-03-22 19:03:59 +09:00
f8d5bd9441
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
be4e459af5
Merge "Fixing comments in Network Capabilities" am: d6da5146e7
am: fd41459278

Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-12 08:08:31 +00:00
84eab7e76c
Merge "Fixing comments in Network Capabilities"
am: d6da5146e7

Change-Id: Iacbcac2e740099ea6b6a6f7a646f046370fd16f5

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-12 07:57:07 +00:00
fd41459278
Merge "Fixing comments in Network Capabilities"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-03-12 07:42:58 +00:00
d6da5146e7
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
c30002742f
Merge "Deprecate most of NetworkInfo." am: 12c57e795c
am: 94d7da3a7c

Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1

Chalard Jean   authored and   android-build-merger   commited 2018-03-09 13:12:08 +00:00
b295d028c8
Merge "Deprecate most of NetworkInfo."
am: 12c57e795c

Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1

Chalard Jean   authored and   android-build-merger   commited 2018-03-09 12:57:15 +00:00
94d7da3a7c
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
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

Chalard Jean   commited 2018-03-09 15:38:25 +09:00
28857b2a31
Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc
am: 6d8274ebf1

Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-07 23:09:04 +00:00
fbb48a210f
Merge "Minor clean-up in NetworkCapabilities"
am: 98dc002acc

Change-Id: Ic70f545a4886461f38f1af934600f4e1afe0179f

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-07 23:00:53 +00:00
6d8274ebf1
Merge "Minor clean-up in NetworkCapabilities"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-03-07 21:06:59 +00:00
98dc002acc
Merge "Extend network request to query networks w/o capabilites" am: 762a14565b am: 76136de729
am: 60bcd4b9d9

Change-Id: I3bf776767be61577f1bca0d98d4aaf82a0e45336

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-03 00:14:52 +00:00
07aeacfbd5
Merge "Extend network request to query networks w/o capabilites"
am: 762a14565b

Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-02 23:52:18 +00:00
76136de729
Merge "Extend network request to query networks w/o capabilites"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-03-02 19:04:31 +00:00
762a14565b
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32 am: e999899287
am: f6c1bf66ba

Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc

Chalard Jean   authored and   android-build-merger   commited 2018-03-02 13:25:02 +00:00
0c788ec3df
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
am: dce4d4ca32

Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036

Chalard Jean   authored and   android-build-merger   commited 2018-03-02 13:10:45 +00:00
e999899287
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: ef307293e5 am: 58c3355b8f
am: d98aec5eee

Change-Id: Ifd77149ca2c45249b8776c878c6fac46ae81c2a4

Chalard Jean   authored and   android-build-merger   commited 2018-03-02 12:54:29 +00:00
1618bad6e0
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
am: ef307293e5

Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da

Chalard Jean   authored and   android-build-merger   commited 2018-03-02 12:34:25 +00:00
58c3355b8f
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
Chalard Jean   authored and   Gerrit Code Review   commited 2018-03-02 11:52:15 +00:00
dce4d4ca32
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

Chalard Jean   commited 2018-03-02 17:10:11 +09:00
8895306c4a
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

Chalard Jean   commited 2018-03-02 16:20:22 +09:00
687546ed4d
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

Pavel Maltsev   commited 2018-03-01 18:06:25 -08:00
42016b3e96
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

Pavel Maltsev   commited 2018-03-01 17:52:02 -08:00
40ba60c765
Merge "Fix up NetworkCapabilities' toString" am: ef16e8daab am: 2e4c0bf13c
am: 7f245b1f71

Change-Id: I3d3f3f34f30b69750e197b185c4e70bd360f35e0

Chalard Jean   authored and   android-build-merger   commited 2018-03-01 06:13:04 +00:00
1c8ffcfc46
Merge "Fix up NetworkCapabilities' toString"
am: ef16e8daab

Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518

Chalard Jean   authored and   android-build-merger   commited 2018-03-01 05:48:14 +00:00
2e4c0bf13c
Merge "Fix up NetworkCapabilities' toString"
Chalard Jean   authored and   Gerrit Code Review   commited 2018-03-01 04:01:16 +00:00
ef16e8daab
Fix up NetworkCapabilities' toString
Test: manual
Change-Id: I3bcec6a6873e8ec7ced0820d3d5b92249b19fe0a

Chalard Jean   commited 2018-02-28 19:47:48 +09:00
8337e58db2
Merge "Add OEM_PAID network capability" am: 230f251155 am: 35999ae101
am: fe1ed24e15

Change-Id: Id64d288764dc5a556b60f5e3b866b40792647ac0

Pavel Maltsev   authored and   android-build-merger   commited 2018-02-28 08:42:24 +00:00
f12177caec
Merge "Add OEM_PAID network capability"
am: 230f251155

Change-Id: I2fb8825bc1038783ef45907846b52192b6fe5d18

Pavel Maltsev   authored and   android-build-merger   commited 2018-02-28 08:14:48 +00:00
35999ae101
Merge "Add OEM_PAID network capability"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-02-28 07:06:00 +00:00
230f251155
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688 am: 4f00de4aad
am: 137c833e70

Change-Id: I2ce9d740b82f591b847150ec1eaffa39bfbd0241

nharold   authored and   android-build-merger   commited 2018-02-20 23:21:59 +00:00
8974c107ae
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
am: f6bbc21688

Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c

nharold   authored and   android-build-merger   commited 2018-02-20 22:55:38 +00:00
4f00de4aad
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
nharold   authored and   Gerrit Code Review   commited 2018-02-20 19:17:23 +00:00
f6bbc21688
Merge "DO NOT MERGE : fix useless import"
Chalard Jean   authored and   Gerrit Code Review   commited 2018-02-18 23:14:42 +00:00
1da02e25a4
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

Nathan Harold   commited 2018-02-16 16:34:50 -08:00
e8ae0ebed3
DO NOT MERGE : fix useless import
This was added to avoid a merge conflict at a sensitive time.
It can (and should) go.

Test: no code change
Change-Id: I11d73e2d988ae61a168aa0f1cc7c2c506f509d30

Chalard Jean   commited 2018-02-16 17:21:39 +09:00
a3e497c580
Merge "Add missing'}' in javadoc of public API method" am: 21c11c37b1 am: e7c45d2c8a
am: ede2444697

Change-Id: I2cfda60077c57d151fb8599845cd202bbc4e625d

Hugo Benichi   authored and   android-build-merger   commited 2018-02-16 07:58:57 +00:00
51443b3817
Merge "Add missing'}' in javadoc of public API method"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-02-16 03:19:35 +00:00
21c11c37b1
Add OEM_PAID network capability
Bug: 68762530

Test: runtest -x frameworks/base/tests/net/

Change-Id: I51c07e0c2211d631e90b27468c26b599e7b07bc8

Pavel Maltsev   commited 2018-02-15 10:46:00 -08:00
3d5e45dc38
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: bc388ae1a9 am: d6b4143b67
am: 3ea90e3152

Change-Id: Ic6d639358c3310820bd925df93d4843d7edffc57

Chalard Jean   authored and   android-build-merger   commited 2018-02-15 14:23:57 +00:00
4bb2e013fa
Deprecate CONNECTIVITY_ACTION.
That was its destiny.
Use NetworkCallbacks instead.

Test: runtest frameworks-net, but this is only doc changes
Change-Id: I3d68dbf817de92c66d899a7cc4519c5639e4c049

Chalard Jean   commited 2018-02-14 15:14:44 +09:00
ae2424a97b
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
NOT_SUSPENDED and FOREGROUND are capabilities that need to
be public so as to reach feature parity with what information
can be gotten through the use of CONNECTIVITY_ACTION and
synchronous calls to ConnectivityManager. This change makes
them public, and wires up the NOT_SUSPENDED capability.
This deprecates in effect the old onSuspended and onResumed
callbacks, but these have never been public.

This also converts the onAvailable path from a multiple
binder call design to a simpler, single binder call. This
is only for internal convenience

Test: runtest frameworks-net
Test: cts
Test: also manual testing
Change-Id: I6ea524bb361ecef0569ea2f9006c1e516378bc25

Chalard Jean   commited 2018-02-14 15:14:41 +09:00
b6a0c6dc07