Michal Karpinski
e892b77d8d
Fix naming of the service in NetdEventListenerServiceTest
...
am: 4c9fcb84ca
Change-Id: If4b50bf104dddcaf14fd6b138239cfc94967f389
2016-09-26 11:38:37 +00:00
Michal Karpinski
4c9fcb84ca
Fix naming of the service in NetdEventListenerServiceTest
...
Bug: 29748723
Change-Id: I285cb77fba824036df80a9ed2560ee95d1d1919c
(cherry picked from commit 4b6d072726 )
2016-09-26 10:43:56 +00:00
Michal Karpinski
4b6d072726
Fix naming of the service in NetdEventListenerServiceTest
...
Bug: 29748723
Change-Id: I285cb77fba824036df80a9ed2560ee95d1d1919c
2016-09-26 09:20:25 +01:00
Hugo Benichi
4403ad76ca
Merge "IpConnectivityLog uses new metrics service" into nyc-mr1-dev am: 4996bc8105 am: d5680ac912
...
am: 5f51d92253
Change-Id: I878da89bb1804a55bca4b4c35e5924a12af34ff3
2016-09-25 20:19:13 +00:00
Hugo Benichi
b54260227b
resolve merge conflicts of 8e9d612 to nyc-mr1-dev-plus-aosp
...
am: fc76c02ce2
Change-Id: I4bfd7a9bc5ef4c3c5a30bed63b92eaef90b1a30e
2016-09-25 20:18:16 +00:00
Lorenzo Colitti
fb03e0d5cb
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev am: d1532107e1 am: fe2d469de0
...
am: 90bef34d88
Change-Id: Ib15c9ac54d9e493aea8fe5bb80d63356d33da137
2016-09-25 20:12:54 +00:00
Lorenzo Colitti
236ecdcd2c
Restrict access to background networks to CHANGE_NETWORK_STATE. am: 1034b7c1ff am: 783c3e763d
...
am: 1b9ddf554d
Change-Id: I49bc23dcb5f36654c61a7aa76c41cebda81349f5
2016-09-25 20:11:52 +00:00
Hugo Benichi
8e4f8ff0ee
Add ipconnectivity.proto to services jar am: ad509bd205 am: 446a3847b4
...
am: 0c85261577
Change-Id: Id194acbb25c8f3dd8fdf03af67912f7a0f0f770f
2016-09-24 02:11:20 +00:00
Hugo Benichi
5f51d92253
Merge "IpConnectivityLog uses new metrics service" into nyc-mr1-dev am: 4996bc8105
...
am: d5680ac912
Change-Id: Ib9e1bc6873ad1fb045b57eb54c4a164148d68f14
2016-09-23 06:03:59 +00:00
Hugo Benichi
fc76c02ce2
resolve merge conflicts of 8e9d612 to nyc-mr1-dev-plus-aosp
...
Change-Id: I82865b2847c584f8a1d728ef76113e3969f222ca
2016-09-23 14:48:01 +09:00
Hugo Benichi
d5680ac912
Merge "IpConnectivityLog uses new metrics service" into nyc-mr1-dev
...
am: 4996bc8105
Change-Id: I7fae7760d5ec872a0a989ca3964419d3839694ad
2016-09-23 04:48:51 +00:00
Hugo Benichi
8e9d612218
IpConnectivityLog uses new metrics service
...
am: 9eec53dbe4
Change-Id: I1e3b611eeec448e333e83cb8d630f0e9906b7f14
2016-09-23 04:48:49 +00:00
Hugo Benichi
4996bc8105
Merge "IpConnectivityLog uses new metrics service" into nyc-mr1-dev
2016-09-23 04:43:23 +00:00
Lorenzo Colitti
90bef34d88
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev am: d1532107e1
...
am: fe2d469de0
Change-Id: I7d47b6c065f45edeecf3fd5df133545dad561d0f
2016-09-23 04:02:09 +00:00
Lorenzo Colitti
1b9ddf554d
Restrict access to background networks to CHANGE_NETWORK_STATE. am: 1034b7c1ff
...
am: 783c3e763d
Change-Id: Ie4179344aa12e38d2e2a5fab43e028ca0c97150d
2016-09-23 04:01:07 +00:00
Lorenzo Colitti
fe2d469de0
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev
...
am: d1532107e1
Change-Id: I8fa53ac5143bd5df0177a11e5961acef63072007
2016-09-23 03:57:34 +00:00
Lorenzo Colitti
783c3e763d
Restrict access to background networks to CHANGE_NETWORK_STATE.
...
am: 1034b7c1ff
Change-Id: Iaf4ccd24298f680cab39bf9b87604eb16bc53aa5
2016-09-23 03:57:32 +00:00
TreeHugger Robot
d1532107e1
Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev
2016-09-23 03:51:15 +00:00
Lorenzo Colitti
1034b7c1ff
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
0c85261577
Add ipconnectivity.proto to services jar am: ad509bd205
...
am: 446a3847b4
Change-Id: I1fc947f98715a7a352753d85cd4ef4970be2b027
2016-09-23 00:18:31 +00:00
Hugo Benichi
9eec53dbe4
IpConnectivityLog uses new metrics service
...
This patch connects existing IpConnectivityLog to the new
IpConnectivityMetrics service:
- IpConnectivityLog is now an independent class that pushes events
directly to the new IpConnectivityMetrics service.
- DnsEventListenerService is moved from MetricsLoggerService to
IpConnectivityMetrics.
- this patch also features end to end tests from IpConnectivityLog to
IpConnectivityMetrics dumpsys output.
Bug: 31254800
Change-Id: I4fe4a209eedde2814d5f13c574a1a0d854bd05c9
2016-09-22 23:08:37 +09:00
Hugo Benichi
ad509bd205
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
37d9a70953
Rematch wifi networks when the avoid bad wifi setting changes. am: 320b446d11 am: 1f6b9ebaf3 am: e913dded2b
...
am: d05a12d77e
Change-Id: I4566c5fe1620f48ae4fa70fdf23095381dce41af
2016-09-21 21:23:24 +00:00
Michal Karpinski
75ae88a25b
Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest
...
am: 137e2b2c98
Change-Id: Ibdf0487739d2ecff13a6115098f454b1682081a3
2016-09-21 21:17:54 +00:00
Michal Karpinski
aa7c1eb863
Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest
...
Change-Id: I67e645306444938a4675e91a9db5d716c0bd4881
(cherry picked from commit d82fccd368ca605c8efc21b198e667fd30c4182e)
2016-09-21 14:33:56 +00:00
Lorenzo Colitti
d05a12d77e
Rematch wifi networks when the avoid bad wifi setting changes. am: 320b446d11 am: 1f6b9ebaf3
...
am: e913dded2b
Change-Id: Id45ac22c3070de67fb3455c6d8a3c44d22388ff6
2016-09-21 09:57:56 +00:00
Michal Karpinski
137e2b2c98
Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest
...
Change-Id: I67e645306444938a4675e91a9db5d716c0bd4881
2016-09-21 18:48:57 +09:00
Lorenzo Colitti
1f6b9ebaf3
Rematch wifi networks when the avoid bad wifi setting changes.
...
am: 320b446d11
Change-Id: I589cfdb8792997fe94d22c551c8a53e48e45db1a
2016-09-21 09:47:28 +00:00
Lorenzo Colitti
320b446d11
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
67ddf8e727
Add debug output for bad wifi avoidance restrictions. am: 7dabed84b5 am: f0718d3ba4 am: 86bd4caed2
...
am: cd1774ab71
Change-Id: Iae0c5c85ac843c999d625105b9469500c464266e
2016-09-21 06:06:08 +00:00
Lorenzo Colitti
4cb763a5e5
Support "don't ask again" in the avoid bad wifi dialog. am: e98557f85a am: b3b2b23d17 am: 63275aba54
...
am: 54042555a0
Change-Id: I60ebe27ec892658c5a051457b13506e59ba33824
2016-09-21 06:04:15 +00:00
Lorenzo Colitti
cd1774ab71
Add debug output for bad wifi avoidance restrictions. am: 7dabed84b5 am: f0718d3ba4
...
am: 86bd4caed2
Change-Id: Ieedaeb98e71bc58f3813d7b5e5472c0e147e50f9
2016-09-20 17:40:14 +00:00
Lorenzo Colitti
54042555a0
Support "don't ask again" in the avoid bad wifi dialog. am: e98557f85a am: b3b2b23d17
...
am: 63275aba54
Change-Id: I7d8d9f91208bcbe3ff625acf20d943b13f813d8e
2016-09-20 17:39:19 +00:00
Lorenzo Colitti
f0718d3ba4
Add debug output for bad wifi avoidance restrictions.
...
am: 7dabed84b5
Change-Id: I17e42fb80763a9d48049db9d0785b54bd5005797
2016-09-20 17:15:50 +00:00
Lorenzo Colitti
b3b2b23d17
Support "don't ask again" in the avoid bad wifi dialog.
...
am: e98557f85a
Change-Id: Ic6a1917a83e2d847bd673790e2c36f7316ca7acd
2016-09-20 17:14:50 +00:00
Lorenzo Colitti
7dabed84b5
Add debug output for bad wifi avoidance restrictions.
...
Bug: 31075769
Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203
2016-09-20 22:01:39 +09:00
Lorenzo Colitti
e98557f85a
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
43d868386a
reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp
...
am: 2693c153e0
Change-Id: Iea1d75ffbb79f9e5012b67f731ce23bcb993781c
2016-09-16 20:04:05 +00:00
Etan Cohen
2693c153e0
reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp
...
Change-Id: Idb6cca34536fdbb94876d5cde0b2309462840da1
2016-09-16 12:40:03 -07:00
Etan Cohen
525481484c
[NAN] Add transport type for NAN.
...
am: 305ea28a43
Change-Id: I9e12a30de06481418fa2c322fbeef0ecde75f746
2016-09-16 18:45:49 +00:00
Lorenzo Colitti
925fe5aedd
Update the avoid bad wifi settings on the handler thread. am: 49d32fe109 am: 4aba7d2b78 am: 409425302b
...
am: 012018f6c6
Change-Id: I5af2e404b8830dea2ea39d7e897ca2ce56f94d5a
2016-09-16 17:57:01 +00:00
Lorenzo Colitti
012018f6c6
Update the avoid bad wifi settings on the handler thread. am: 49d32fe109 am: 4aba7d2b78
...
am: 409425302b
Change-Id: I02d6cd44bd0588d2a516e65daba811638a2eb0cf
2016-09-16 17:46:19 +00:00
Lorenzo Colitti
4aba7d2b78
Update the avoid bad wifi settings on the handler thread.
...
am: 49d32fe109
Change-Id: I595949881353f5779ed2bb55ff05f27b513cd6de
2016-09-16 17:32:09 +00:00
Lorenzo Colitti
49d32fe109
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
6d25c74a2d
resolve merge conflicts of eccdb24 to master
...
Change-Id: Ib09134090aa135d88bb807034b262a23c8b40e5f
2016-09-16 01:45:15 +09:00
Lorenzo Colitti
eccdb24d89
Unit tests for avoid bad wifi networks setting. am: 71b4d66e16 am: 58a33b9656
...
am: f131f80e0a
Change-Id: I1c0f4549545ff9f1836154ef65661395835ad756
2016-09-15 16:20:27 +00:00
Lorenzo Colitti
4b06c53661
Support displaying a dialog when wifi becomes unvalidated. am: 477bf5caa9 am: 8591027b21
...
am: 56e32083b5
Change-Id: Id908683dce15ffbafc042d506a38ec26d5e9a6ee
2016-09-15 16:18:42 +00:00
Lorenzo Colitti
58a33b9656
Unit tests for avoid bad wifi networks setting.
...
am: 71b4d66e16
Change-Id: I6491f1a93f93f222e23ef6e5e437631556637e44
2016-09-15 16:05:45 +00:00
Lorenzo Colitti
8591027b21
Support displaying a dialog when wifi becomes unvalidated.
...
am: 477bf5caa9
Change-Id: I8b8e2b652510ca75407a9ad3c29ed111367941e0
2016-09-15 16:04:03 +00:00
Hugo Benichi
6f19e24c10
Support ignoring penalty for bad wifi networks am: 4fc79c45d2 am: 03b25a12c7 am: edabb8e617
...
am: 89b552d5dd
Change-Id: I995c1adc61263a0536704fd32bd89efe1a8ec42b
2016-09-15 15:45:03 +00:00