Lorenzo Colitti
e88410a694
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev am: 3972d910f1 am: f96a37fb8d
...
am: 45a6252d6d
Change-Id: Ib15c9ac54d9e493aea8fe5bb80d63356d33da137
2016-09-25 20:12:54 +00:00
Lorenzo Colitti
50d8cd9119
Restrict access to background networks to CHANGE_NETWORK_STATE. am: b8d9f52adb am: 9410bde219
...
am: 494c218bff
Change-Id: I49bc23dcb5f36654c61a7aa76c41cebda81349f5
2016-09-25 20:11:52 +00:00
Hugo Benichi
2741f10188
Add ipconnectivity.proto to services jar am: a54812907b am: 446a3847b4
...
am: c0c25c8a6e
Change-Id: Id194acbb25c8f3dd8fdf03af67912f7a0f0f770f
2016-09-24 02:11:20 +00:00
Lorenzo Colitti
45a6252d6d
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev am: 3972d910f1
...
am: f96a37fb8d
Change-Id: I7d47b6c065f45edeecf3fd5df133545dad561d0f
2016-09-23 04:02:09 +00:00
Lorenzo Colitti
494c218bff
Restrict access to background networks to CHANGE_NETWORK_STATE. am: b8d9f52adb
...
am: 9410bde219
Change-Id: Ie4179344aa12e38d2e2a5fab43e028ca0c97150d
2016-09-23 04:01:07 +00:00
Lorenzo Colitti
f96a37fb8d
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev
...
am: 3972d910f1
Change-Id: I8fa53ac5143bd5df0177a11e5961acef63072007
2016-09-23 03:57:34 +00:00
Lorenzo Colitti
9410bde219
Restrict access to background networks to CHANGE_NETWORK_STATE.
...
am: b8d9f52adb
Change-Id: Iaf4ccd24298f680cab39bf9b87604eb16bc53aa5
2016-09-23 03:57:32 +00:00
TreeHugger Robot
3972d910f1
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev
2016-09-23 03:51:15 +00:00
Lorenzo Colitti
b8d9f52adb
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
2016-09-23 11:27:13 +09:00
Hugo Benichi
c0c25c8a6e
Add ipconnectivity.proto to services jar am: a54812907b
...
am: 446a3847b4
Change-Id: I1fc947f98715a7a352753d85cd4ef4970be2b027
2016-09-23 00:18:31 +00:00
Hugo Benichi
a54812907b
Add ipconnectivity.proto to services jar
...
This patch moves ipconnectivity.proto and companion serialization
classes from /vendor/google/app/ConnectivityMetrics into the framework
services jar.
This will allow to implement a dumpsys interface for IpConnectivity
metrics events defined in android.net.metrics that output metrics as
a serialized proto.
Bug: 31254800
Change-Id: Ia4449103fd7222c9d899352fea2dce47a790a49c
2016-09-22 22:21:41 +09:00
Lorenzo Colitti
79d9aee66e
Rematch wifi networks when the avoid bad wifi setting changes. am: 0895e175fd am: 73e97b9fdb am: e913dded2b
...
am: 8822148ace
Change-Id: I4566c5fe1620f48ae4fa70fdf23095381dce41af
2016-09-21 21:23:24 +00:00
Michal Karpinski
e12a727e56
Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest
...
am: 66d4a5baf2
Change-Id: Ibdf0487739d2ecff13a6115098f454b1682081a3
2016-09-21 21:17:54 +00:00
Michal Karpinski
fbf1d8638c
Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest
...
Change-Id: I67e645306444938a4675e91a9db5d716c0bd4881
(cherry picked from commit d82fccd368ca605c8efc21b198e667fd30c4182e)
2016-09-21 14:33:56 +00:00
Lorenzo Colitti
8822148ace
Rematch wifi networks when the avoid bad wifi setting changes. am: 0895e175fd am: 73e97b9fdb
...
am: e913dded2b
Change-Id: Id45ac22c3070de67fb3455c6d8a3c44d22388ff6
2016-09-21 09:57:56 +00:00
Michal Karpinski
66d4a5baf2
Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest
...
Change-Id: I67e645306444938a4675e91a9db5d716c0bd4881
2016-09-21 18:48:57 +09:00
Lorenzo Colitti
73e97b9fdb
Rematch wifi networks when the avoid bad wifi setting changes.
...
am: 0895e175fd
Change-Id: I589cfdb8792997fe94d22c551c8a53e48e45db1a
2016-09-21 09:47:28 +00:00
Lorenzo Colitti
0895e175fd
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
2016-09-21 15:10:14 +09:00
Lorenzo Colitti
8f9d71a925
Add debug output for bad wifi avoidance restrictions. am: a4e8808d16 am: c74af76009 am: 86bd4caed2
...
am: 18a2ad067e
Change-Id: Iae0c5c85ac843c999d625105b9469500c464266e
2016-09-21 06:06:08 +00:00
Lorenzo Colitti
e414d2ef36
Support "don't ask again" in the avoid bad wifi dialog. am: c65750c8a0 am: 74cb76ff80 am: 63275aba54
...
am: ec500d94b0
Change-Id: I60ebe27ec892658c5a051457b13506e59ba33824
2016-09-21 06:04:15 +00:00
Lorenzo Colitti
18a2ad067e
Add debug output for bad wifi avoidance restrictions. am: a4e8808d16 am: c74af76009
...
am: 86bd4caed2
Change-Id: Ieedaeb98e71bc58f3813d7b5e5472c0e147e50f9
2016-09-20 17:40:14 +00:00
Lorenzo Colitti
ec500d94b0
Support "don't ask again" in the avoid bad wifi dialog. am: c65750c8a0 am: 74cb76ff80
...
am: 63275aba54
Change-Id: I7d8d9f91208bcbe3ff625acf20d943b13f813d8e
2016-09-20 17:39:19 +00:00
Lorenzo Colitti
c74af76009
Add debug output for bad wifi avoidance restrictions.
...
am: a4e8808d16
Change-Id: I17e42fb80763a9d48049db9d0785b54bd5005797
2016-09-20 17:15:50 +00:00
Lorenzo Colitti
74cb76ff80
Support "don't ask again" in the avoid bad wifi dialog.
...
am: c65750c8a0
Change-Id: Ic6a1917a83e2d847bd673790e2c36f7316ca7acd
2016-09-20 17:14:50 +00:00
Lorenzo Colitti
a4e8808d16
Add debug output for bad wifi avoidance restrictions.
...
Bug: 31075769
Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203
2016-09-20 22:01:39 +09:00
Lorenzo Colitti
c65750c8a0
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
2016-09-20 16:03:53 +09:00
Etan Cohen
5850df844f
reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp
...
am: c2c7d7ff8a
Change-Id: Iea1d75ffbb79f9e5012b67f731ce23bcb993781c
2016-09-16 20:04:05 +00:00
Etan Cohen
c2c7d7ff8a
reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp
...
Change-Id: Idb6cca34536fdbb94876d5cde0b2309462840da1
2016-09-16 12:40:03 -07:00
Etan Cohen
c0077e3fe1
[NAN] Add transport type for NAN.
...
am: 305ea28a43
Change-Id: I9e12a30de06481418fa2c322fbeef0ecde75f746
2016-09-16 18:45:49 +00:00
Lorenzo Colitti
2d6c1945a0
Update the avoid bad wifi settings on the handler thread. am: 21924545a2 am: 65f957399f am: 409425302b
...
am: b003ca1ec6
Change-Id: I5af2e404b8830dea2ea39d7e897ca2ce56f94d5a
2016-09-16 17:57:01 +00:00
Lorenzo Colitti
b003ca1ec6
Update the avoid bad wifi settings on the handler thread. am: 21924545a2 am: 65f957399f
...
am: 409425302b
Change-Id: I02d6cd44bd0588d2a516e65daba811638a2eb0cf
2016-09-16 17:46:19 +00:00
Lorenzo Colitti
65f957399f
Update the avoid bad wifi settings on the handler thread.
...
am: 21924545a2
Change-Id: I595949881353f5779ed2bb55ff05f27b513cd6de
2016-09-16 17:32:09 +00:00
Lorenzo Colitti
21924545a2
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
2016-09-17 00:57:38 +09:00
Lorenzo Colitti
1f80a59004
resolve merge conflicts of b62007a to master
...
Change-Id: Ib09134090aa135d88bb807034b262a23c8b40e5f
2016-09-16 01:45:15 +09:00
Lorenzo Colitti
b62007a830
Unit tests for avoid bad wifi networks setting. am: 83633c897a am: 26b930e3c7
...
am: f131f80e0a
Change-Id: I1c0f4549545ff9f1836154ef65661395835ad756
2016-09-15 16:20:27 +00:00
Lorenzo Colitti
f23aa46f08
Support displaying a dialog when wifi becomes unvalidated. am: 199ecfc79f am: 2b5b0e027b
...
am: 56e32083b5
Change-Id: Id908683dce15ffbafc042d506a38ec26d5e9a6ee
2016-09-15 16:18:42 +00:00
Lorenzo Colitti
26b930e3c7
Unit tests for avoid bad wifi networks setting.
...
am: 83633c897a
Change-Id: I6491f1a93f93f222e23ef6e5e437631556637e44
2016-09-15 16:05:45 +00:00
Lorenzo Colitti
2b5b0e027b
Support displaying a dialog when wifi becomes unvalidated.
...
am: 199ecfc79f
Change-Id: I8b8e2b652510ca75407a9ad3c29ed111367941e0
2016-09-15 16:04:03 +00:00
Hugo Benichi
7c4ffcea6b
Support ignoring penalty for bad wifi networks am: c9048bc556 am: 6630a620f9 am: edabb8e617
...
am: b2229c7168
Change-Id: I995c1adc61263a0536704fd32bd89efe1a8ec42b
2016-09-15 15:45:03 +00:00
Hugo Benichi
b2229c7168
Support ignoring penalty for bad wifi networks am: c9048bc556 am: 6630a620f9
...
am: edabb8e617
Change-Id: Ib9a60eb528eb62ebf26d5d5a1941bfed0bb21163
2016-09-15 15:36:58 +00:00
Lorenzo Colitti
a3b2cd7abc
resolve merge conflicts of bbc1519 to nyc-mr1-dev am: 8121c2d0aa am: 886df309be
...
am: 9321342942
Change-Id: I81dadfcd629dd4dc5843932f7571d9df9bc3654f
2016-09-15 15:36:43 +00:00
Lorenzo Colitti
9321342942
resolve merge conflicts of bbc1519 to nyc-mr1-dev am: 8121c2d0aa
...
am: 886df309be
Change-Id: I0fd163898bb51e11bc2a21ae8ba7761691a737ce
2016-09-15 15:30:24 +00:00
Hugo Benichi
6630a620f9
Support ignoring penalty for bad wifi networks
...
am: c9048bc556
Change-Id: I6666ee45e9a08c02444c6268b2232bbe8aa2adec
2016-09-15 15:23:57 +00:00
Lorenzo Colitti
83633c897a
Unit tests for avoid bad wifi networks setting.
...
Bug: 31075769
Change-Id: I21ba20df59ddce5731ef1ebe8846b3f00578a674
2016-09-15 23:45:07 +09:00
Lorenzo Colitti
199ecfc79f
Support displaying a dialog when wifi becomes unvalidated.
...
Bug: 31075769
Change-Id: I7a6e7580769365bea930f638bd44edcaa28df134
2016-09-15 23:33:34 +09:00
Lorenzo Colitti
8121c2d0aa
resolve merge conflicts of bbc1519 to nyc-mr1-dev
...
Change-Id: Ib1294563c6ae20454e44bfa5fc9fb2797864b8f5
2016-09-15 22:47:08 +09:00
Hugo Benichi
c9048bc556
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
2016-09-15 18:34:13 +09:00
Hugo Benichi
bbc15194de
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
2016-09-15 18:33:23 +09:00
Lorenzo Colitti
440aba8c9c
Add test coverage for background networks. am: d8a23ad61f am: 815bbf5678
...
am: 620562c61c
Change-Id: Ibbb14bd30b9b18799d301f023eb6770affbca518
2016-09-14 20:25:59 +00:00
Lorenzo Colitti
242b00f7ed
Add a NET_CAPABILITY_FOREGROUND capability. am: 0f04220ffe am: aaec66110d
...
am: aabaa907de
Change-Id: I08ca73666668ddc6c9bfe002844a9d2e0ecb28e4
2016-09-14 19:22:54 +00:00