Robin Lee
495418cd9c
Merge "Disable always-on VPN in factoryReset" am: 5765604627
...
am: 7960c6b8b5
Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6
2017-01-23 16:54:59 +00:00
Robin Lee
7960c6b8b5
Merge "Disable always-on VPN in factoryReset"
...
am: 5765604627
Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8
2017-01-23 16:47:58 +00:00
Robin Lee
5765604627
Merge "Disable always-on VPN in factoryReset"
2017-01-23 16:40:07 +00:00
Erik Kline
fa0b8e4cee
Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308
...
am: 9d02ee9030
Change-Id: Ic67b2d4589f586c67109216330f68cb1fc08c55a
2017-01-23 07:20:32 +00:00
Erik Kline
9d02ee9030
Merge "More concisely export whether we have a "tetherable configuration""
...
am: edea114308
Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f
2017-01-23 07:13:56 +00:00
Treehugger Robot
edea114308
Merge "More concisely export whether we have a "tetherable configuration""
2017-01-23 07:04:22 +00:00
Erik Kline
cf917febba
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
2017-01-23 13:04:28 +09:00
Hugo Benichi
2c197f713b
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours
...
am: 6d8bca8c99 -s ours
Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
2017-01-20 07:55:35 +00:00
Hugo Benichi
6d8bca8c99
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
...
am: 216a4e7655 -s ours
Change-Id: I05fe9095395df00b96df3cbe3a6e4f31a160e0b5
2017-01-20 07:51:31 +00:00
Hugo Benichi
ad903ab032
DO NOT MERGE Unit tests for NetworkNotificationManager
...
Test: new unit test, no functional changes.
Bug: 32198726
(cherry picked from commit 20904677af )
Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
2017-01-20 15:08:38 +09:00
Tamas Berghammer
c82c85ddad
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
2017-01-18 19:59:59 +00:00
Tamas Berghammer
b04cd1691c
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
This reverts commit 671998abdb .
Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
2017-01-18 19:33:22 +00:00
Tamas Berghammer
f7ee59ced0
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
2017-01-18 12:58:01 +00:00
Koichi, Sugimoto
d1a32ad120
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
2017-01-18 10:02:58 +00:00
Lorenzo Colitti
3daca8b56b
Merge "Enable mobile data always on." am: 68317d6329
...
am: ab50ac01d0
Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94
2017-01-17 04:31:00 +00:00
Lorenzo Colitti
ab50ac01d0
Merge "Enable mobile data always on."
...
am: 68317d6329
Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7
2017-01-17 04:25:44 +00:00
Treehugger Robot
68317d6329
Merge "Enable mobile data always on."
2017-01-17 04:15:34 +00:00
Lorenzo Colitti
73f44c7656
Enable mobile data always on.
...
Test: has been on in fishfood several months.
Bug: 23113288
Change-Id: I73ba432f619d28dab78e2d865d56aa7e7c5a67f9
2017-01-17 11:07:50 +09:00
Hugo Benichi
d630a308c0
Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc
...
am: 540eca1aac
Change-Id: I839ed526e802b88bbed490b611f90d829b952f26
2017-01-16 05:04:39 +00:00
Hugo Benichi
540eca1aac
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
...
am: 37727596cc
Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295
2017-01-16 05:00:30 +00:00
Hugo Benichi
90755df180
ConnectivityServiceTest: some fixes in CallbackInfo
...
- CallbackInfo becomes a static class so that it can be instantiated
and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
returns null when timing out, which was not failing the test cleanly.
Test: ConnectivityServiceTest passes
Bug: 32561414
Change-Id: I64d382a35fe83f21bded98e6906c1ec70a8f1085
2017-01-16 11:15:04 +09:00
Etan Cohen
34d83975fe
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
...
am: 4aaaa99c3d
Change-Id: I6f894d92451032657678639c3021eef07289a6a2
2017-01-11 23:17:19 +00:00
Etan Cohen
4aaaa99c3d
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
...
am: dfe8f5dc13
Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
2017-01-11 23:12:16 +00:00
Etan Cohen
15a2750335
[AWARE] Unhide Wi-Fi Aware API (baseline)
...
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).
Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
2017-01-11 11:13:26 -08:00
Tamas Berghammer
671998abdb
Update package names to work with the proto3 compiler
...
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 792b79610b )
2017-01-11 11:27:38 +00:00
Hugo Benichi
89cbf02bab
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 9019f5d0eb -s ours
...
am: 26e2c619c0 -s ours
Change-Id: Icf09b29bfe619ee56d4e9ae0d640ed00fbb4ef31
2017-01-11 01:27:40 +00:00
Hugo Benichi
b26f13f2da
DO NOT MERGE Captive portal systel log improvements am: 5ca0b9ce20 -s ours
...
am: 1367239bb2 -s ours
Change-Id: If06761b413cda9d3f79aa79e8ae60cf0ce306946
2017-01-11 01:23:51 +00:00
Hugo Benichi
cc673e7e95
DO NOT MERGE Fix flaky IpPrefixTest. am: b3d00ef8c8 -s ours
...
am: d07a77a40c -s ours
Change-Id: Ic492f64b8fc44dc9a8ca1abd539fe757c703acac
2017-01-11 01:22:35 +00:00
Hugo Benichi
26e2c619c0
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
...
am: 9019f5d0eb -s ours
Change-Id: I12ea7b87369c3228bb1fcc914cfdb316a3b501ce
2017-01-11 01:18:00 +00:00
Hugo Benichi
1367239bb2
DO NOT MERGE Captive portal systel log improvements
...
am: 5ca0b9ce20 -s ours
Change-Id: Ibce1d4e604e5fd8c67c012cd7f264e4585117b24
2017-01-11 01:14:04 +00:00
Hugo Benichi
d07a77a40c
DO NOT MERGE Fix flaky IpPrefixTest.
...
am: b3d00ef8c8 -s ours
Change-Id: I929a0ef7a6a044d2263a04867c2701653c3634de
2017-01-11 01:12:54 +00:00
Hugo Benichi
9019f5d0eb
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
...
This patch changes CaptivePortalLoginActivity captive portal test to be
consistent with NetworkMonitor by:
- using Network.java to open the http connection.
- adding a UserAgent property to the request header.
Test: manually tested.
Bug: 32369183
(cherry picked from commit dce21c52bf )
Change-Id: I559eb0497475daad758ba3b3395225dcd0a27a57
2017-01-05 12:12:50 +09:00
Hugo Benichi
5ca0b9ce20
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
2017-01-05 12:09:35 +09:00
Hugo Benichi
b3d00ef8c8
DO NOT MERGE Fix flaky IpPrefixTest.
...
Test: IpPrefixTest passes
Bug: 32561414
(cherry picked from commit b3ac7ab583 )
Change-Id: I42928da87f7f336900b3a95ebbf28563864da8d4
2017-01-05 12:07:38 +09:00
Mark Lu
2157cf135a
docs: changes to broadcast documentation am: e1682a08b7
...
am: 538a5cf796
Change-Id: I2e8377b188ce6a10ea633e089c3a20f9ef7908fd
2016-12-16 05:06:42 +00:00
Mark Lu
538a5cf796
docs: changes to broadcast documentation
...
am: e1682a08b7
Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
2016-12-16 04:59:08 +00:00
Erik Kline
86abfb03b9
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a
...
am: 479b8c3a2c
Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
2016-12-15 12:28:41 +00:00
Erik Kline
479b8c3a2c
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
...
am: 80ff5ecd4a
Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
2016-12-15 12:22:06 +00:00
Erik Kline
4abe144dd7
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
...
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug: 21859053
Bug: 26101306
Bug: 31742572
Bug: 31707128
Bug: 33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
2016-12-15 19:09:49 +09:00
Erik Kline
fec0502419
Merge "More correct startup and shutdown procedures." am: 0530b1e65d
...
am: 22c6c1a5b2
Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
2016-12-15 05:32:50 +00:00
Erik Kline
22c6c1a5b2
Merge "More correct startup and shutdown procedures."
...
am: 0530b1e65d
Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
2016-12-15 05:25:48 +00:00
Treehugger Robot
0530b1e65d
Merge "More correct startup and shutdown procedures."
2016-12-15 05:10:11 +00:00
Erik Kline
46e27d950b
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
2016-12-15 10:43:41 +09:00
Erik Kline
2c062156df
Merge "Stop setting net.hostname" am: 042b78ef5e
...
am: 06c37fff06
Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23
2016-12-14 08:07:01 +00:00
Erik Kline
06c37fff06
Merge "Stop setting net.hostname"
...
am: 042b78ef5e
Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62
2016-12-14 07:59:59 +00:00
Treehugger Robot
042b78ef5e
Merge "Stop setting net.hostname"
2016-12-14 07:51:00 +00:00
Erik Kline
06da441cfa
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
2016-12-14 13:11:15 +09:00
Mark Lu
e1682a08b7
docs: changes to broadcast documentation
...
- move BroadcastReceiver info to developer guide. see cl/140402421
- add usage note to CONNECTIVITY_ACTION broadcast
bug:32533262
bug:33106411
Change-Id: Ic2aa517831d29418e0c42aa6fc1e7f9aeb50f802
2016-12-13 18:28:32 -08:00
Erik Kline
e17f2b6a8b
Merge "Stop setting net.dns{1234} system properties." am: 2ecbd49edd
...
am: 62f75e995a
Change-Id: I7d400352de4bc11204cd1ec8c9aeda5381cd4931
2016-12-12 08:35:20 +00:00
Erik Kline
62f75e995a
Merge "Stop setting net.dns{1234} system properties."
...
am: 2ecbd49edd
Change-Id: I9b31b281896995943ce8217c3230867db380a841
2016-12-12 08:29:14 +00:00