Hugo Benichi
bbc0ef654c
Merge "Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e am: 876ebaa8e1" into oc-dev-plus-aosp
...
am: 584f97470c -s ours
Change-Id: Icb2bf64f15e720dc33c870bc23538b03a0a34dd6
2017-04-24 20:51:54 +00:00
Hugo Benichi
b22a842978
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e
...
am: 876ebaa8e1
Change-Id: I0dfcea2b92287115c385f1b7678034f643d5daba
2017-04-24 19:06:20 +00:00
Hugo Benichi
8026fefa5f
Merge changes I5187d17c,I49a76582 am: 8b41dd0318 am: f2e5cf715d am: 31259c219f
...
am: 72ba66b48a
2017-04-22 01:07:59 +00:00
Hugo Benichi
b2dddaefef
Merge "NsdManager: add unit tests" am: dc1684ab07 am: 40ab8401b2 am: d2181235b9
...
am: 3fdd0bf76a
2017-04-22 01:06:17 +00:00
Hugo Benichi
72ba66b48a
Merge changes I5187d17c,I49a76582 am: 8b41dd0318 am: f2e5cf715d
...
am: 31259c219f
Change-Id: I174179db3a08ba51aef737cfb3956d1cf789b362
2017-04-22 00:59:36 +00:00
Hugo Benichi
21665ac809
Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)
...
This patch is a partial cherry-pick from commit
cf83a3f4dacf83a3f4da
2017-04-22 09:58:42 +09:00
Hugo Benichi
3fdd0bf76a
Merge "NsdManager: add unit tests" am: dc1684ab07 am: 40ab8401b2
...
am: d2181235b9
Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235
2017-04-22 00:57:48 +00:00
Hugo Benichi
8b41dd0318
Merge changes I5187d17c,I49a76582
...
* changes:
ConnectivityService: regroup bool <-> int conversions
ConnectivityService: move reportNetworkConnectivity to handler
2017-04-22 00:34:07 +00:00
Hugo Benichi
dc1684ab07
Merge "NsdManager: add unit tests"
2017-04-22 00:31:28 +00:00
Robert Greenwalt
09064e6974
Merge "Mark Restricted APN connections as restricted." am: a6a4f5589c am: 1778682242 am: 88a6acb9f6 -s ours
...
am: c99a35d0f7
2017-04-21 23:50:37 +00:00
Robert Greenwalt
c99a35d0f7
Merge "Mark Restricted APN connections as restricted." am: a6a4f5589c am: 1778682242
...
am: 88a6acb9f6 -s ours
Change-Id: I7a0019557721593761ae605db8e28bf4e15c06b0
2017-04-21 23:36:13 +00:00
Treehugger Robot
a6a4f5589c
Merge "Mark Restricted APN connections as restricted."
2017-04-21 23:12:52 +00:00
Robin Lee
a2f8396835
Merge "Use Vpn rules (not firewall) for always-on VPN" am: dcb162176e am: cd8557d15a am: 4de3794c26
...
am: 8fc4ec1ec4
2017-04-21 22:24:31 +00:00
Robin Lee
8fc4ec1ec4
Merge "Use Vpn rules (not firewall) for always-on VPN" am: dcb162176e am: cd8557d15a
...
am: 4de3794c26
Change-Id: Ic1e96eac68ddc8a713b3c71b5c126cb8b99c59f5
2017-04-21 22:17:15 +00:00
Robert Greenwalt
1f4578fa86
Mark Restricted APN connections as restricted.
...
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug: 37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac
2017-04-21 22:00:17 +00:00
Treehugger Robot
dcb162176e
Merge "Use Vpn rules (not firewall) for always-on VPN"
2017-04-21 21:53:15 +00:00
Erik Kline
b16df0be12
Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev am: 83e2a25461
...
am: 1712602711
2017-04-21 07:06:35 +00:00
Erik Kline
1712602711
Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev
...
am: 83e2a25461
Change-Id: I5c91199114ee1a48629523377fc06deda48f5579
2017-04-21 07:01:35 +00:00
Hugo Benichi
f4210294ac
ConnectivityService: regroup bool <-> int conversions
...
This patch cleanups conversion of boolean values to ints when reading
configuration values or sending Messages whose arg1 or arg2 has boolean
semantics.
Test: runtest frameworks-net
Change-Id: I5187d17cd746486f63b1c410d191c30edd93ff6f
2017-04-21 15:18:51 +09:00
Hugo Benichi
d6b510a23e
ConnectivityService: move reportNetworkConnectivity to handler
...
This patch moves reportNetworkConnectivity onto the handler of
ConnectivityService.
This allows:
- to inspect NetworkAgentInfo on the ConnectivityService handler,
which is always more correct than doing so on a Binder thread.
- to improve locking policies around NetworkAgentInfo.
Test: $ runtest frameworks-net
Bug: 37119619, 36902662
Change-Id: I49a765826e65c29a1995242290e5e7544112c94e
2017-04-21 15:17:54 +09:00
Hugo Benichi
7f792c577a
NsdManager: add unit tests
...
This prepares some refactoring and the addition of a timeout to
resolveService.
Test: new tests pass
Bug: 37013369, 33298084
Change-Id: Ie8277bd5983278507bfa70495b4ce7d13895b24b
2017-04-21 05:16:37 +00:00
Erik Kline
5dbf59c901
Add local-only hotspot info into tether state change broadcast
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
2017-04-21 13:26:04 +09:00
Erik Kline
6c07df789b
Merge "Add local-only hotspot info into tether state change broadcast" am: 21a081bf34 am: 6af3dd0fc3 am: 3fa8908370
...
am: 015d03a4d1
2017-04-20 16:29:52 +00:00
Hugo Benichi
2bacd532e4
Merge "ConnectivityManager: remove obsolete callback types" am: afeeac07e2 am: 23ee1621c7 am: b51307e12e
...
am: 6fa7889bd8
2017-04-20 16:28:06 +00:00
Erik Kline
438704a10d
Merge "Make tetherChangePermission to be secured for AppOps permission" am: d721dd8ebb am: 0d1f04384f am: d9bfb83d96
...
am: 278c771b04
2017-04-20 16:22:44 +00:00
Hugo Benichi
2f9259262e
resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp
...
am: 981ee3f2c3
2017-04-20 16:14:29 +00:00
Erik Kline
015d03a4d1
Merge "Add local-only hotspot info into tether state change broadcast" am: 21a081bf34 am: 6af3dd0fc3
...
am: 3fa8908370
Change-Id: If3851c3f15314e3c0d357e154049aaa2b8b5c8e7
2017-04-20 14:02:24 +00:00
Hugo Benichi
6fa7889bd8
Merge "ConnectivityManager: remove obsolete callback types" am: afeeac07e2 am: 23ee1621c7
...
am: b51307e12e
Change-Id: I2f5fad0b559b972e82ecacdfcdd3805f0fbb2655
2017-04-20 13:59:32 +00:00
Erik Kline
278c771b04
Merge "Make tetherChangePermission to be secured for AppOps permission" am: d721dd8ebb am: 0d1f04384f
...
am: d9bfb83d96
Change-Id: I6dd418684b1a40292cd496ead3613cf938577c09
2017-04-20 13:52:35 +00:00
Hugo Benichi
981ee3f2c3
resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp
...
Conflits were:
- static import section of ConnectivityService
- code deleted in commit 8d96292e08
2017-04-20 22:26:50 +09:00
Treehugger Robot
21a081bf34
Merge "Add local-only hotspot info into tether state change broadcast"
2017-04-20 12:47:55 +00:00
Hugo Benichi
afeeac07e2
Merge "ConnectivityManager: remove obsolete callback types"
2017-04-20 12:38:29 +00:00
Erik Kline
762fa8eb96
Add local-only hotspot info into tether state change broadcast
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
2017-04-20 19:44:01 +09:00
Erik Kline
d721dd8ebb
Merge "Make tetherChangePermission to be secured for AppOps permission"
2017-04-20 04:28:53 +00:00
Hugo Benichi
9c7059e371
Merge "ConnectivityManager: unify prety printing of callback types."
2017-04-20 04:28:45 +00:00
Hugo Benichi
f8a0f9f873
ConnectivityManager: remove obsolete callback types
...
This patch also:
- suppresses callback triggers from ConnectivityService for these
obsolete callback types.
- marginally refactors callCallbackForRequest().
Test: runtest frameworks-net
Change-Id: Idfb75640732943c599de4975f252f706d21ad594
2017-04-20 10:42:38 +09:00
Hugo Benichi
8d96292e08
ConnectivityManager: unify prety printing of callback types.
...
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
2017-04-20 10:42:38 +09:00
Robert Greenwalt
38d20a2463
Merge commit 'c2a92c30eae1c9ed258082ffe1e079268e9971b3' into manual_merge_695d2c6df10c
...
Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110
2017-04-19 14:03:30 -07:00
Robert Greenwalt
c2a92c30ea
Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
...
Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6
2017-04-19 11:24:03 -07:00
Tetsutoki Shiozawa
b47da283e7
Make tetherChangePermission to be secured for AppOps permission
...
Symptom:
AppOps verified the incorrect package of calling tether state
changing API.
It threw SecurityException by mistake.
Solution:
Pass the correct package name to enforceTetherChangePermission.
Bug: 32931147
Change-Id: Ia1167f26f556678b189a24a4a716f1a7e5cb12eb
2017-04-19 16:50:33 +09:00
Robert Greenwalt
7316f068a7
Mark Restricted APN connections as restricted.
...
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug: 37208956
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
2017-04-18 11:29:20 -07:00
Erik Kline
30347d60ac
Merge changes I76ae853c,If94102c7 into oc-dev am: 46d1e597bc
...
am: 4b3a517c7b
2017-04-17 05:29:00 +00:00
Erik Kline
4b3a517c7b
Merge changes I76ae853c,If94102c7 into oc-dev
...
am: 46d1e597bc
2017-04-17 05:19:35 +00:00
TreeHugger Robot
46d1e597bc
Merge changes I76ae853c,If94102c7 into oc-dev
...
* changes:
Ignore potential SystemProperties errors when setting net.dns
Make ConnectivityServiceTest pass on wifi-only devices.
2017-04-17 05:11:21 +00:00
Hugo Benichi
90ec98af72
ConnectivityManager: unify prety printing of callback types.
...
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
2017-04-17 08:50:58 +09:00
Etan Cohen
04067ffa4d
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev am: d98f26e4f3 -s ours
...
am: adfc08c7b3
2017-04-15 02:42:20 +00:00
Etan Cohen
adfc08c7b3
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev
...
am: d98f26e4f3 -s ours
Change-Id: Ic728d22ee9d7407df5437e3da0468387f5c098c2
2017-04-15 02:32:31 +00:00
Hugo Benichi
a68b248df7
Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762 am: e505b37ec5
...
am: 82ed0de810
2017-04-14 18:17:31 +00:00
Hugo Benichi
37ae77cb7a
Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am: 0e8090b10e" into oc-dev-plus-aosp
...
am: 562e577b1c -s ours
Change-Id: I87c54fe259d38b87c84485793aa5820b55650583
2017-04-14 17:32:27 +00:00
Lorenzo Colitti
d8bc4cd22a
resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp
...
am: dfa91739a6
2017-04-14 17:02:27 +00:00
