Commit graph android_packages_modules_Co.../services/core/java
Message SHA1
Merge "Disable always-on VPN in factoryReset" am: 5765604627
am: 7960c6b8b5

Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6

Robin Lee   authored and   android-build-merger   commited 2017-01-23 16:54:59 +00:00
495418cd9c
Merge "Disable always-on VPN in factoryReset"
am: 5765604627

Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8

Robin Lee   authored and   android-build-merger   commited 2017-01-23 16:47:58 +00:00
7960c6b8b5
Merge "Disable always-on VPN in factoryReset"
Robin Lee   authored and   Gerrit Code Review   commited 2017-01-23 16:40:07 +00:00
5765604627
Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308
am: 9d02ee9030

Change-Id: Ic67b2d4589f586c67109216330f68cb1fc08c55a

Erik Kline   authored and   android-build-merger   commited 2017-01-23 07:20:32 +00:00
fa0b8e4cee
Merge "More concisely export whether we have a "tetherable configuration""
am: edea114308

Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f

Erik Kline   authored and   android-build-merger   commited 2017-01-23 07:13:56 +00:00
9d02ee9030
More concisely export whether we have a "tetherable configuration"
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla WiFi-to-mobile tethering works
Bug: 32163131
Change-Id: I20dd36b5bf7fc55a639c76ea4bdb55b650654881

Erik Kline   commited 2017-01-23 13:04:28 +09:00
cf917febba
DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 20904677af)

Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3

Hugo Benichi   commited 2017-01-20 15:08:38 +09:00
ad903ab032
Disable always-on VPN in factoryReset
When network setting reset is started while always-on VPN is enabled,
application crash occurs with IllegalStateException in prepareVpn().

Therefore, it's necessary to also disable always-on VPN in factoryReset
before prepareVpn() when turning off VPN.

Bug: 29030858
Change-Id: I08c5406717dd7937d197c2e934a56d037477aafc

Koichi, Sugimoto   authored and   Robin Lee   commited 2017-01-18 10:02:58 +00:00
d1a32ad120
Merge "Enable mobile data always on." am: 68317d6329
am: ab50ac01d0

Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94

Lorenzo Colitti   authored and   android-build-merger   commited 2017-01-17 04:31:00 +00:00
3daca8b56b
Merge "Enable mobile data always on."
am: 68317d6329

Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7

Lorenzo Colitti   authored and   android-build-merger   commited 2017-01-17 04:25:44 +00:00
ab50ac01d0
Enable mobile data always on.
Test: has been on in fishfood several months.
Bug: 23113288
Change-Id: I73ba432f619d28dab78e2d865d56aa7e7c5a67f9

Lorenzo Colitti   commited 2017-01-17 11:07:50 +09:00
73f44c7656
DO NOT MERGE Captive portal systel log improvements
This patch improves system logging around captive portal detection to
make inspection of bug reports sligthly easier:

- NetworkMonitor now logs by default CMD_CAPTIVE_PORTAL_RECHECK and
  CMD_CAPTIVE_PORTAL_APP_FINISHED. Other system logs are kept off with
  a new VDBG boolean contant,
- NetworkNotificationManager now prints the notification id at
  notification time. This allows to easily correlate show and clear.
- errors in NetworkNotificationManager are logged as Throwable instead
  of through their implicit toString() method.

Test: $ runtest frameworks-net
Bug: 32198726

(cherry picked from commit 6fe7d3cdb3)

Change-Id: I1eaab5ea702063dde3e23324d3a1b3dc172c5ac5

Hugo Benichi   commited 2017-01-05 12:09:35 +09:00
5ca0b9ce20
Merge "More correct startup and shutdown procedures." am: 0530b1e65d
am: 22c6c1a5b2

Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae

Erik Kline   authored and   android-build-merger   commited 2016-12-15 05:32:50 +00:00
fec0502419
Merge "More correct startup and shutdown procedures."
am: 0530b1e65d

Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42

Erik Kline   authored and   android-build-merger   commited 2016-12-15 05:25:48 +00:00
22c6c1a5b2
More correct startup and shutdown procedures.
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.

During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.

Test: backport from internal
Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710

Erik Kline   commited 2016-12-15 10:43:41 +09:00
46e27d950b
Merge "Stop setting net.hostname" am: 042b78ef5e
am: 06c37fff06

Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23

Erik Kline   authored and   android-build-merger   commited 2016-12-14 08:07:01 +00:00
2c062156df
Merge "Stop setting net.hostname"
am: 042b78ef5e

Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62

Erik Kline   authored and   android-build-merger   commited 2016-12-14 07:59:59 +00:00
06c37fff06
Stop setting net.hostname
Test: as follows
    - basics:
        - built
        - flashed
        - booted
    - connect to {v4-only, dualstack, v6-only} networks
        - verified expected connectivity on each
    - runtest frameworks-net
Bug: 30979015

Change-Id: I65e9878c7b8eaddaba1c0e1b8566ddfa0760047f

Erik Kline   commited 2016-12-14 13:11:15 +09:00
06da441cfa
Merge "Stop setting net.dns{1234} system properties." am: 2ecbd49edd
am: 62f75e995a

Change-Id: I7d400352de4bc11204cd1ec8c9aeda5381cd4931

Erik Kline   authored and   android-build-merger   commited 2016-12-12 08:35:20 +00:00
e17f2b6a8b
Merge "Stop setting net.dns{1234} system properties."
am: 2ecbd49edd

Change-Id: I9b31b281896995943ce8217c3230867db380a841

Erik Kline   authored and   android-build-merger   commited 2016-12-12 08:29:14 +00:00
62f75e995a
Stop setting net.dns{1234} system properties.
Nothing in the system consumes these properties, they were never part
of an official public API, and they can leak information about the
current network to applications without networking prvileges.

Specifically, these properites allow applications to access network state
(and detect network changes, etc.) without having the ACCESS_NETWORK_STATE
permission.

Test: runtest ConnectivityServiceTest passes
Bug: 33308258
Change-Id: I85abc52bc11aee33940fd0af2397478a9a5c3b8f

Erik Kline   commited 2016-12-09 11:06:52 +09:00
d19cf15010
DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.

Bug: 31402633
Test: all timeout related unit tests pass (new one added)

(cherry picked from commit 88087226a6)

Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748

Etan Cohen   authored and   Lorenzo Colitti   commited 2016-12-08 17:13:37 +09:00
69e6a108a5
DO NOT MERGE: Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699

(cherry picked from commit 3fd101e574)

Change-Id: I90c0f97fe0e41de4059bceae7b56ab3a70145696

Calvin On   authored and   Lorenzo Colitti   commited 2016-12-08 17:13:33 +09:00
488c84ca1f
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
(cherry-pick of 8616c69985)
(cherry picked from commit 66721821df)

Bug: 21414325
Change-Id: I1a58823a372154589f972b98c4c428eab0e0523e

Erik Kline   authored and   Lorenzo Colitti   commited 2016-12-08 17:13:01 +09:00
950bfc31f9
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is
specified for a given network.

Bug: 10705136

(cherry picked from commit 98f9c2c23b)

Change-Id: I89e2fdfbbfa981d435a2974422d9d9c009872d76

Pierre Imai   authored and   Lorenzo Colitti   commited 2016-12-08 16:49:22 +09:00
68902bc1df
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
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

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