Commit graph android_packages_modules_Co.../services/core/java
Message SHA1
New Settings symbols for captive portal detection am: 728a769ee1
am: b196a8e231

Change-Id: I6e965696ed03b0eb4a49db3b21ad6a382ba1d081

Hugo Benichi   authored and   android-build-merger   commited 2016-09-29 01:23:59 +00:00
3f807c2529
New Settings symbols for captive portal detection
This patch defines new Settings symbols for
  - setting the probe urls for captive portal detection.
  - setting which User-Agent to use for captive portal detection.

The existing default values for these settings are not changed, i.e:
  - HTTP and HTTPS probes urls are unchanged.
  - the fallback probe is not used.
  - User-Agent is empty by default.

Bug: 29367974
Change-Id: I6e4b3b172e56b8b67fffa4b51f776d68d5851f25

Hugo Benichi   commited 2016-09-28 23:13:25 +09:00
728a769ee1
Merge "Notify NetworkPolicyManagerService on tethering changes" am: 4062bec04e am: 8d7e3b0205
am: 583fe355b4

Change-Id: I4d1081c832c1d3bff9a0946c670929eca4f0f695

Christopher Wiley   authored and   android-build-merger   commited 2016-09-27 14:18:46 +00:00
a8c7166533
Merge "Notify NetworkPolicyManagerService on tethering changes" am: 4062bec04e
am: 8d7e3b0205

Change-Id: I9595856421a848a570f4894fa55523a72a7fec44

Christopher Wiley   authored and   android-build-merger   commited 2016-09-27 13:32:06 +00:00
583fe355b4
Restrict access to background networks to CHANGE_NETWORK_STATE. am: 1034b7c1ff
am: 783c3e763d

Change-Id: Ie4179344aa12e38d2e2a5fab43e028ca0c97150d

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-23 04:01:07 +00:00
1b9ddf554d
Restrict access to background networks to CHANGE_NETWORK_STATE.
When a network goes into the background, tell netd to set the
network's permission to NETWORK. Also, close all TCP sockets on
that network, to prevent long-lived TCP connections from staying
on it and possibly continuing to use metered data.

Bug: 23113288
Change-Id: Ie89c1940b6739160e25c6e9022b8b977afb3e16e

Lorenzo Colitti   commited 2016-09-23 11:27:13 +09:00
1034b7c1ff
Rematch wifi networks when the avoid bad wifi setting changes. am: 320b446d11 am: 1f6b9ebaf3
am: e913dded2b

Change-Id: Id45ac22c3070de67fb3455c6d8a3c44d22388ff6

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-21 09:57:56 +00:00
d05a12d77e
Rematch wifi networks when the avoid bad wifi setting changes.
am: 320b446d11

Change-Id: I589cfdb8792997fe94d22c551c8a53e48e45db1a

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-21 09:47:28 +00:00
1f6b9ebaf3
Rematch wifi networks when the avoid bad wifi setting changes.
Currently, when the avoid bad wifi setting changes, we rematch
all networks and requests, but do not update any NetworkFactories
with new scores. This means that if a wifi network's score goes
down as a result of enabling bad wifi avoidance, we will not look
for another network (e.g., cell data) to satisfy its requests.

This makes it so that when the user enables avoiding bad wifi,
we will attempt to bring up cell data will if it is not already
connected.

Bug: 31075769
Change-Id: Ie5b685be8676999adea8c9ecbbc1abb92f81a74f

Lorenzo Colitti   commited 2016-09-21 15:10:14 +09:00
320b446d11
Notify NetworkPolicyManagerService on tethering changes
No longer do this in ConnectivityService#tether/untether.
Instead, have Tethering do it when an interface is actually
tethered.

Bug: 31405407
Test: Toggling hotspot now disables data saver

Change-Id: I9910a2e488c30c92d45f817c8f5df0fac5510de6

Christopher Wiley   commited 2016-09-20 15:18:50 -07:00
bc83ba55e5
Add debug output for bad wifi avoidance restrictions. am: 7dabed84b5 am: f0718d3ba4
am: 86bd4caed2

Change-Id: Ieedaeb98e71bc58f3813d7b5e5472c0e147e50f9

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-20 17:40:14 +00:00
cd1774ab71
Support "don't ask again" in the avoid bad wifi dialog. am: e98557f85a am: b3b2b23d17
am: 63275aba54

Change-Id: I7d8d9f91208bcbe3ff625acf20d943b13f813d8e

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-20 17:39:19 +00:00
54042555a0
Add debug output for bad wifi avoidance restrictions.
am: 7dabed84b5

Change-Id: I17e42fb80763a9d48049db9d0785b54bd5005797

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-20 17:15:50 +00:00
f0718d3ba4
Support "don't ask again" in the avoid bad wifi dialog.
am: e98557f85a

Change-Id: Ic6a1917a83e2d847bd673790e2c36f7316ca7acd

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-20 17:14:50 +00:00
b3b2b23d17
Add debug output for bad wifi avoidance restrictions.
Bug: 31075769
Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203

Lorenzo Colitti   commited 2016-09-20 22:01:39 +09:00
7dabed84b5
Support "don't ask again" in the avoid bad wifi dialog.
This contains the following changes:

1. Make NETWORK_AVOID_BAD_WIFI a tristate: 0 means never avoid
   bad wifi, unset means prompt the user, 1 means always avoid.
2. Look at NETWORK_AVOID_BAD_WIFI only if the carrier restricts
   avoiding bad wifi (previously, we relied on the setting being
   null and defaulting to the value of the config variable).
3. Add an avoidUnvalidated bit to NetworkAgentInfo to track
   whether the user has requested switching away from this
   unvalidated network even though avoiding bad wifi is generally
   disabled. This is set to true when the user selects "switch"
   in the dialog without setting the "Don't ask again" checkbox.
4. Add a hidden setAvoidUnvalidated API to ConnectivityManager to
   set the avoidUnvalidated bit.
5. Additional unit test coverage.

Bug: 31075769
Change-Id: I1be60c3016c8095df3c4752330149ce638bd0ce1

Lorenzo Colitti   commited 2016-09-20 16:03:53 +09:00
e98557f85a
Update the avoid bad wifi settings on the handler thread. am: 49d32fe109 am: 4aba7d2b78
am: 409425302b

Change-Id: I02d6cd44bd0588d2a516e65daba811638a2eb0cf

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-16 17:46:19 +00:00
012018f6c6
Update the avoid bad wifi settings on the handler thread.
am: 49d32fe109

Change-Id: I595949881353f5779ed2bb55ff05f27b513cd6de

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-16 17:32:09 +00:00
4aba7d2b78
Update the avoid bad wifi settings on the handler thread.
Currently, every call to avoidBadWifi fetches the current value
of the config variable and setting whenever it is called. This
means that the score of an unvalidated wifi network can
unpredictably change at any time, creating a data race.

Instead, persist the value and only update it when something
changes.

Bug: 31075769
Change-Id: I0f4e0e742c91ef77fabc95d3ebb494338396aca5

Lorenzo Colitti   commited 2016-09-17 00:57:38 +09:00
49d32fe109
Unit tests for avoid bad wifi networks setting. am: 71b4d66e16 am: 58a33b9656
am: f131f80e0a

Change-Id: I1c0f4549545ff9f1836154ef65661395835ad756

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-15 16:20:27 +00:00
eccdb24d89
Support displaying a dialog when wifi becomes unvalidated. am: 477bf5caa9 am: 8591027b21
am: 56e32083b5

Change-Id: Id908683dce15ffbafc042d506a38ec26d5e9a6ee

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-15 16:18:42 +00:00
4b06c53661
Unit tests for avoid bad wifi networks setting.
am: 71b4d66e16

Change-Id: I6491f1a93f93f222e23ef6e5e437631556637e44

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-15 16:05:45 +00:00
58a33b9656
Support displaying a dialog when wifi becomes unvalidated.
am: 477bf5caa9

Change-Id: I8b8e2b652510ca75407a9ad3c29ed111367941e0

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-15 16:04:03 +00:00
8591027b21
Support ignoring penalty for bad wifi networks am: 4fc79c45d2 am: 03b25a12c7
am: edabb8e617

Change-Id: Ib9a60eb528eb62ebf26d5d5a1941bfed0bb21163

Hugo Benichi   authored and   android-build-merger   commited 2016-09-15 15:36:58 +00:00
89b552d5dd
resolve merge conflicts of 810f491 to nyc-mr1-dev am: d1d74d350f
am: 886df309be

Change-Id: I0fd163898bb51e11bc2a21ae8ba7761691a737ce

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-15 15:30:24 +00:00
909fc4719d
Support ignoring penalty for bad wifi networks
am: 4fc79c45d2

Change-Id: I6666ee45e9a08c02444c6268b2232bbe8aa2adec

Hugo Benichi   authored and   android-build-merger   commited 2016-09-15 15:23:57 +00:00
03b25a12c7
Unit tests for avoid bad wifi networks setting.
Bug: 31075769
Change-Id: I21ba20df59ddce5731ef1ebe8846b3f00578a674

Lorenzo Colitti   commited 2016-09-15 23:45:07 +09:00
71b4d66e16
Support displaying a dialog when wifi becomes unvalidated.
Bug: 31075769
Change-Id: I7a6e7580769365bea930f638bd44edcaa28df134

Lorenzo Colitti   commited 2016-09-15 23:33:34 +09:00
477bf5caa9
resolve merge conflicts of 810f491 to nyc-mr1-dev
Change-Id: Ib1294563c6ae20454e44bfa5fc9fb2797864b8f5

Lorenzo Colitti   commited 2016-09-15 22:47:08 +09:00
d1d74d350f
Support ignoring penalty for bad wifi networks
This patch adds a way to configure devices so that a validated network
that becomes unvalidated is not penalized in the network scoring and
selection logic.

The intent is to prevent devices configured to do so from switching to a
lower scoring network such as cellular networks when a higher scoring
network such as wifi networks loses internet connectivity.

Bug: 31075769
Change-Id: Ie7e0f2607d214a178367fedfbef6c44768fa00a4

Hugo Benichi   commited 2016-09-15 18:34:13 +09:00
4fc79c45d2
Explicitly pass old score to updateCapabilities
This allows simplification of getCurrentScore function in
NetworkAgentInfo and its return value to depend on everValidated and
lastValidated.

Bug: 31075769
Change-Id: I0b3c85e3a61b006733e900e0a231424878317476

Hugo Benichi   commited 2016-09-15 18:33:23 +09:00
810f4917c2
Add a NET_CAPABILITY_FOREGROUND capability. am: 32237c7a69
am: aaec66110d

Change-Id: I78d6aa21f8e4c6bbd9cefb4a36f1b77f4bbe4104

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-13 16:23:10 +00:00
27e1fd3169
Add a NET_CAPABILITY_FOREGROUND capability.
Bug: 23113288
Change-Id: I90cb9ffb5751f0d9ec822933f37680c401e49966

Lorenzo Colitti   commited 2016-09-13 12:02:13 +09:00
32237c7a69
Add a background NetworkRequest type for mobile data always on. am: b5b725df0c
am: 9396da4e10

Change-Id: I4b0e05e8bb87e37bf2564fd255b8be7a2b20118a

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-12 13:48:53 +00:00
18328033db
Rematch requests first and listens second. am: 5d8b6bdb6e
am: 836a5db809

Change-Id: Ia57cd548b2920efaee733f5cb0df66139a6e55e6

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-12 13:46:48 +00:00
6fb1ebeb50
Add a background NetworkRequest type for mobile data always on.
Like a normal (foreground) request, a background request is only
satisfied by one network and will keep that network up. Unlike a
foreground request, when a network only has background requests,
it will linger, and after lingering is complete, it will become
a background network.

Future CLs will cause the system to treat background networks
differently, e.g., by requiring different permissions.

Bug: 23113288
Change-Id: I40f735269dad1042eb04fea15e64584fc903ccb3

Lorenzo Colitti   commited 2016-09-09 18:49:24 +09:00
b5b725df0c
Rematch requests first and listens second.
This CL splits rematching in two parts: first rematch requests,
then rematch listens. This will allow us to change a network's
capabilities depending on what requests are on that network, and
properly dispatch callbacks depending on those capabilities.

The behaviour changes are as follows:

- Before this CL, callbacks for requests and listens were sent
  intermingled. After this CL, all request callbacks will be
  grouped together, and all listen callbacks will be grouped
  together.
- Before this CL, the order was:
    1. Send onLost callbacks.
    2. If applicable, switch the default network.
    3. Send onAvailable callbacks.
  After this CL, the order is:
    1. Send onLost callbacks for requests.
    2. If applicable, switch the default network.
    3. Send onLost callbacks for listens.
    4. Send onAvailable callbacks for listens.
    5. Send onAvailable callbacks for requests.

These changes shouldn't affect any apps because:

1. The order of callbacks continues to be first all onLost,
   then all onAvailable.
2. Both the old and the new code send callbacks in no particular
   order. Thus, the possible ordering combinations of callbacks
   in the new code are a strict subset of the possible ordering
   combinations of the old code.
3. The default network is switched before any onAvailable
   callback is sent.
4. Even though the new code does not send all onLost callbacks
   before switching the default network, even before this CL
   there was no guarantee that those callbacks would be received
   before the default network switch anyway, because callbacks
   are asynchronous.

Bug: 23113288
Change-Id: Ia08900c50db9ff43895047e2f4f36b6c6c31a1f9

Lorenzo Colitti   commited 2016-09-09 18:28:00 +09:00
5d8b6bdb6e
Network switch notifications: rate & daily limits am: e5ebb71a81 am: 858499b2c0
am: 2c535a4f7c

Change-Id: I166dd693345ed9a63411f5f1ed6bdf33015b1957

Lorenzo Colitti   authored and   android-build-merger   commited 2016-08-30 20:32:52 +00:00
20a701cbc6
Network Switching Notifications: add unit tests am: 550ad8d1d0 am: 56f1281888
am: cf5f5785c9

Change-Id: I978e49ba1302ca3d791c59555b5a143cefb62c06

Hugo Benichi   authored and   android-build-merger   commited 2016-08-30 20:31:34 +00:00
ed9a34a936
Network switch notifications: rate & daily limits
This patch adds a daily limit to the maximum number of notifications
shown when switching networks.

It also adds a rate limit to prevent rapid successive notifications in
flapping scenarios.

Bug: 31132499
Change-Id: Iccb6d0899646ea6df3cfad32a421922263e0eb85

Lorenzo Colitti   authored and   Hugo Benichi   commited 2016-08-31 00:36:11 +09:00
e5ebb71a81
Network Switching Notifications: add unit tests
BUG: 31132499
Change-Id: I9c50a59fe48efdcb51d2517f0a756691700c3ebe

Hugo Benichi   commited 2016-08-31 00:35:16 +09:00
550ad8d1d0
Don't notify on network switch if source network is validated. am: 673e80f021 am: b301283d57
am: a0a41b1e3d

Change-Id: I047a0040798223c163d333996e6bc06e206129a0

Lorenzo Colitti   authored and   android-build-merger   commited 2016-08-30 11:02:33 +00:00
1b5c43a0d3
Don't notify on network switch if source network is validated.
Sometimes we switch away from a network to another (e.g., wifi to
cell data) not because the old network is unvalidated, but
because the score is lowered by a low signal strength.

In this case, don't notify the user of a network switch.

Bug: 31132499
Change-Id: I996a6e00096f8cb864fa9b00b36921725a4edb53

Lorenzo Colitti   commited 2016-08-29 16:30:21 +09:00
673e80f021
Support notifying network switches via notifications and toasts. am: b268f9f554 am: 4549d8b4aa
am: 10acdf7ad1

Change-Id: I0324cfdb7c070464c2caa73fa5fad8d1031c1e76

Lorenzo Colitti   authored and   android-build-merger   commited 2016-08-25 09:36:13 +00:00
9c231f7179
Support notifying network switches via notifications and toasts.
Bug: 31025214
Change-Id: If1578f422f38a1dcfaec529882aed01ae5e8d53c

Lorenzo Colitti   commited 2016-08-25 18:14:18 +09:00
b268f9f554
Refactor NetworkNotificationManager. am: eb166f447b am: a6dcb89e6d
am: 4e0916b416

Change-Id: I548b311ab8dc1d7e08f17a6b31573262c8a4518e

Lorenzo Colitti   authored and   android-build-merger   commited 2016-08-23 17:21:39 +00:00
9a0d4e6590
Move notification code out of ConnectivityService. am: 7d31cc0021 am: 622b5fbbf5
am: 28707247f4

Change-Id: I6e3290891f322c1caca3ff70a3aa39dd140d6256

Lorenzo Colitti   authored and   android-build-merger   commited 2016-08-23 17:20:59 +00:00
2caa412d20
Refactor NetworkNotificationManager.
1. Move from deprecated network types to transport types.
2. Rename and simplify (by passing in a NetworkAgentInfo object)
   the call signature of the method that displays notifications.
3. Add a method to clear notification, and unindent lots of code.
4. Move the legacy DcTracker-issued notification code to
   NetworkNotificationManager.

Bug: 31025214
Change-Id: Ie49c60126d0ed5bac620bc47e84fe038791b2d6c

Lorenzo Colitti   commited 2016-08-23 17:57:46 +09:00
eb166f447b
Move notification code out of ConnectivityService.
Bug: 31025214
Change-Id: I4190be6b57f92298b79bea8868f1876ecbfd2d75

Lorenzo Colitti   commited 2016-08-23 15:31:59 +09:00
7d31cc0021
IpConnectivityMetrics: no metrics upload in tests am: 638621a1f9
am: ae048d8363

Change-Id: I4171f72e27f39f2c10e4607b84934676337c1b4e

Hugo Benichi   authored and   android-build-merger   commited 2016-07-29 09:34:35 +00:00
89218fdd83