Commit graph android_packages_modules_Co.../services/core/java
Message SHA1
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c am: 4942a15e19 am: 1e0ea3cc22
am: 2ae41619ae

Change-Id: Iee7c8575ee22a494e2657e15e1aaae9b05a37045

Christopher Wiley   authored and   android-build-merger   commited 2016-10-25 18:43:16 +00:00
ab83d5b80c
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c
am: 4942a15e19

Change-Id: Ica704d0a64dde80ae0a9f1cef0250bfbdafcd49a

Christopher Wiley   authored and   android-build-merger   commited 2016-10-25 18:31:02 +00:00
1e0ea3cc22
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
am: 836ffa6e1c

Change-Id: I1dab386e3891c01a2917c32847d2aecdbfa10102

Christopher Wiley   authored and   android-build-merger   commited 2016-10-25 18:23:02 +00:00
4942a15e19
Add unit tests for Tethering.isTetherProvisioningRequired
Check that we tolerate various dependencies not being available.

Bug: 31946071
Test: These are tests

Change-Id: Ic0a9cd6f255ba9ff4c774dee640df1a0bdf8dc39

Christopher Wiley   commited 2016-10-24 17:07:05 -07:00
a28f756e2d
Add option to skip and avoid captive portals.
am: 1bf7fdd625

Change-Id: Id38d5c03d06822f9b20abd65db9dd04c90110b63

Calvin On   authored and   android-build-merger   commited 2016-10-20 20:18:10 +00:00
16da19b314
Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit 3fd101e574)

Calvin On   commited 2016-10-20 18:50:46 +00:00
1bf7fdd625
Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0

Calvin On   commited 2016-10-20 00:51:39 -07:00
3fd101e574
Refactor "avoid bad wifi" logic into a utility class am: fc52be9643 am: f0582faceb am: fdb7b562cf
am: 8bd57a31b8

Change-Id: Ie3d058d6c9da43763d10b0a2bc96171d07673e9d

Erik Kline   authored and   android-build-merger   commited 2016-10-07 01:03:58 +00:00
58d1a44fbe
Refactor "avoid bad wifi" logic into a utility class am: fc52be9643 am: f0582faceb
am: fdb7b562cf

Change-Id: I7db61e54c80ec836d00bf4ae087137bb296c30f1

Erik Kline   authored and   android-build-merger   commited 2016-10-06 20:44:56 +00:00
8bd57a31b8
Refactor "avoid bad wifi" logic into a utility class
am: fc52be9643

Change-Id: I4a6ad3791ac551b0d64b37dd4e2afef1e8e8ee10

Erik Kline   authored and   android-build-merger   commited 2016-10-04 07:47:52 +00:00
f0582faceb
Refactor "avoid bad wifi" logic into a utility class
Additionally, add this utility class to IpManager for compatibility
verification.  A follow-on CL will make use of IpManager's local
AvoidBadWifiTracker.

Bug: 31827713
Change-Id: If8c56c3f8076d6a5157ea180e361bbdadc2bc1dd

Erik Kline   authored and   Lorenzo Colitti   commited 2016-10-04 15:07:42 +09:00
fc52be9643
Notify NetworkPolicyManagerService on tethering changes
(cherry-pick of d73faf07606d40d3915d22a72fa14f7ba956d459)

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-30 10:33:19 -07:00
0c252807c8
New Settings symbols for captive portal detection am: 728a769ee1 am: b196a8e231
am: 3f807c2529

Change-Id: Iad6840b4edd243a77fe65a69a2f4dcba28e0a7cb

Hugo Benichi   authored and   android-build-merger   commited 2016-09-29 06:09:56 +00:00
164dd69148
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
am: a8c7166533

Change-Id: I6075604795f97992d02bef28bb5cef85eb31d589

Christopher Wiley   authored and   android-build-merger   commited 2016-09-27 14:24:33 +00:00
9e7695915e
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
am: 1b9ddf554d

Change-Id: I49bc23dcb5f36654c61a7aa76c41cebda81349f5

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-25 20:11:52 +00:00
236ecdcd2c
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
am: d05a12d77e

Change-Id: I4566c5fe1620f48ae4fa70fdf23095381dce41af

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-21 21:23:24 +00:00
37d9a70953
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
Add debug output for bad wifi avoidance restrictions. am: 7dabed84b5 am: f0718d3ba4 am: 86bd4caed2
am: cd1774ab71

Change-Id: Iae0c5c85ac843c999d625105b9469500c464266e

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-21 06:06:08 +00:00
67ddf8e727
Support "don't ask again" in the avoid bad wifi dialog. am: e98557f85a am: b3b2b23d17 am: 63275aba54
am: 54042555a0

Change-Id: I60ebe27ec892658c5a051457b13506e59ba33824

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-21 06:04:15 +00:00
4cb763a5e5
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
am: 012018f6c6

Change-Id: I5af2e404b8830dea2ea39d7e897ca2ce56f94d5a

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-16 17:57:01 +00:00
925fe5aedd
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
resolve merge conflicts of eccdb24 to master
Change-Id: Ib09134090aa135d88bb807034b262a23c8b40e5f

Lorenzo Colitti   commited 2016-09-16 01:45:15 +09:00
6d25c74a2d
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
am: 89b552d5dd

Change-Id: I995c1adc61263a0536704fd32bd89efe1a8ec42b

Hugo Benichi   authored and   android-build-merger   commited 2016-09-15 15:45:03 +00:00
6f19e24c10
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
am: 909fc4719d

Change-Id: I81dadfcd629dd4dc5843932f7571d9df9bc3654f

Lorenzo Colitti   authored and   android-build-merger   commited 2016-09-15 15:36:43 +00:00
dcc85dd2c1
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