Hugo Benichi
03b7f286ca
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours
...
am: dfcad2252b -s ours
Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
2017-01-20 07:55:35 +00:00
Hugo Benichi
dfcad2252b
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
f4fcd280f1
DO NOT MERGE Unit tests for NetworkNotificationManager
...
Test: new unit test, no functional changes.
Bug: 32198726
(cherry picked from commit baebb23d3c )
Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
2017-01-20 15:08:38 +09:00
Tamas Berghammer
a05cbcb4b1
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
4dac494ece
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
This reverts commit 0c0c8f7825 .
Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
2017-01-18 19:33:22 +00:00
Tamas Berghammer
4ce688e0d8
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
2017-01-18 12:58:01 +00:00
Lorenzo Colitti
e50c60e1f1
Merge "Enable mobile data always on." am: 7ab1654533
...
am: 0df74d1ee7
Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94
2017-01-17 04:31:00 +00:00
Lorenzo Colitti
0df74d1ee7
Merge "Enable mobile data always on."
...
am: 7ab1654533
Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7
2017-01-17 04:25:44 +00:00
Treehugger Robot
7ab1654533
Merge "Enable mobile data always on."
2017-01-17 04:15:34 +00:00
Lorenzo Colitti
bcecc7a8ae
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
073a0ac614
Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc
...
am: ac7e9a2b47
Change-Id: I839ed526e802b88bbed490b611f90d829b952f26
2017-01-16 05:04:39 +00:00
Hugo Benichi
ac7e9a2b47
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
...
am: 37727596cc
Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295
2017-01-16 05:00:30 +00:00
Hugo Benichi
b573a2964c
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
463d3c6e7c
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
...
am: 877ccf68fb
Change-Id: I6f894d92451032657678639c3021eef07289a6a2
2017-01-11 23:17:19 +00:00
Etan Cohen
877ccf68fb
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
...
am: dfe8f5dc13
Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
2017-01-11 23:12:16 +00:00
Etan Cohen
785ddc7f52
[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
0c0c8f7825
Update package names to work with the proto3 compiler
...
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 55f36459c8 )
2017-01-11 11:27:38 +00:00
Hugo Benichi
57c7fc11bd
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 22569ca49a -s ours
...
am: b18218fb06 -s ours
Change-Id: Icf09b29bfe619ee56d4e9ae0d640ed00fbb4ef31
2017-01-11 01:27:40 +00:00
Hugo Benichi
f258886732
DO NOT MERGE Captive portal systel log improvements am: fce1a04cc7 -s ours
...
am: 73c57874b9 -s ours
Change-Id: If06761b413cda9d3f79aa79e8ae60cf0ce306946
2017-01-11 01:23:51 +00:00
Hugo Benichi
5c3b167517
DO NOT MERGE Fix flaky IpPrefixTest. am: 79a968d619 -s ours
...
am: 01eeebdf88 -s ours
Change-Id: Ic492f64b8fc44dc9a8ca1abd539fe757c703acac
2017-01-11 01:22:35 +00:00
Hugo Benichi
b18218fb06
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
...
am: 22569ca49a -s ours
Change-Id: I12ea7b87369c3228bb1fcc914cfdb316a3b501ce
2017-01-11 01:18:00 +00:00
Hugo Benichi
73c57874b9
DO NOT MERGE Captive portal systel log improvements
...
am: fce1a04cc7 -s ours
Change-Id: Ibce1d4e604e5fd8c67c012cd7f264e4585117b24
2017-01-11 01:14:04 +00:00
Hugo Benichi
01eeebdf88
DO NOT MERGE Fix flaky IpPrefixTest.
...
am: 79a968d619 -s ours
Change-Id: I929a0ef7a6a044d2263a04867c2701653c3634de
2017-01-11 01:12:54 +00:00
Hugo Benichi
22569ca49a
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 454e066e27 )
Change-Id: I559eb0497475daad758ba3b3395225dcd0a27a57
2017-01-05 12:12:50 +09:00
Hugo Benichi
fce1a04cc7
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 2a3998dd05 )
Change-Id: I1eaab5ea702063dde3e23324d3a1b3dc172c5ac5
2017-01-05 12:09:35 +09:00
Hugo Benichi
79a968d619
DO NOT MERGE Fix flaky IpPrefixTest.
...
Test: IpPrefixTest passes
Bug: 32561414
(cherry picked from commit f5ec69155d )
Change-Id: I42928da87f7f336900b3a95ebbf28563864da8d4
2017-01-05 12:07:38 +09:00
Mark Lu
ec5096b07a
docs: changes to broadcast documentation am: 3e422ac3cc
...
am: 276e436a24
Change-Id: I2e8377b188ce6a10ea633e089c3a20f9ef7908fd
2016-12-16 05:06:42 +00:00
Mark Lu
276e436a24
docs: changes to broadcast documentation
...
am: 3e422ac3cc
Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
2016-12-16 04:59:08 +00:00
Erik Kline
c372b4ba35
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a
...
am: 4f4a914a0f
Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
2016-12-15 12:28:41 +00:00
Erik Kline
4f4a914a0f
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
867dfd1057
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
84a2a19c36
Merge "More correct startup and shutdown procedures." am: 8a825051a2
...
am: 7b5f0a82d0
Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
2016-12-15 05:32:50 +00:00
Erik Kline
7b5f0a82d0
Merge "More correct startup and shutdown procedures."
...
am: 8a825051a2
Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
2016-12-15 05:25:48 +00:00
Treehugger Robot
8a825051a2
Merge "More correct startup and shutdown procedures."
2016-12-15 05:10:11 +00:00
Erik Kline
679d496620
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
5adcdbad97
Merge "Stop setting net.hostname" am: 5603f5aabc
...
am: af3207bddd
Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23
2016-12-14 08:07:01 +00:00
Erik Kline
af3207bddd
Merge "Stop setting net.hostname"
...
am: 5603f5aabc
Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62
2016-12-14 07:59:59 +00:00
Treehugger Robot
5603f5aabc
Merge "Stop setting net.hostname"
2016-12-14 07:51:00 +00:00
Erik Kline
1b81ea3e69
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
3e422ac3cc
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
43d5129fe5
Merge "Stop setting net.dns{1234} system properties." am: 269d35f870
...
am: cc122a0d6c
Change-Id: I7d400352de4bc11204cd1ec8c9aeda5381cd4931
2016-12-12 08:35:20 +00:00
Erik Kline
cc122a0d6c
Merge "Stop setting net.dns{1234} system properties."
...
am: 269d35f870
Change-Id: I9b31b281896995943ce8217c3230867db380a841
2016-12-12 08:29:14 +00:00
Treehugger Robot
269d35f870
Merge "Stop setting net.dns{1234} system properties."
2016-12-12 08:16:35 +00:00
Lorenzo Colitti
7fbb7d397d
Merge changes from topic 'framework-net-aosp' am: 5ad2853426
...
am: 1a2fa0f372
Change-Id: I746ee7fd37946df2ba31ca8aee928fa3ef04591c
2016-12-09 10:18:11 +00:00
Hugo Benichi
6bca82763d
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: 787d3da986 -s ours
...
am: 9f65f04157 -s ours
Change-Id: I717dbbd4d3ed657fec9ed9f45a5ae6f3e2a04b3e
2016-12-09 10:08:43 +00:00
Hugo Benichi
3a00c6b08e
DO NOT MERGE: Netd events: record connect() success/errno am: 74e67ae938 -s ours
...
am: d84f932680 -s ours
Change-Id: I2e11ad15c3327a1d57453295ebc904dcf68ec3e0
2016-12-09 10:07:51 +00:00
Tony Mak
22f0d5b47d
DO NOT MERGE: Show notification for always-on app VPN am: c777123d5c -s ours
...
am: 118071a481 -s ours
Change-Id: I35f5107f9984284379136fd86c57432317066e68
2016-12-09 10:05:30 +00:00
Stephen Chen
179fbd9c84
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 757658193d -s ours
...
am: 3f5785260e -s ours
Change-Id: Ib6f4a4af04c3f4e26028604c66f6cc4f1720a801
2016-12-09 10:04:41 +00:00
Hugo Benichi
858eef0c7d
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: b1bddc92c5 -s ours
...
am: a30ae5542b -s ours
Change-Id: If1fe794f87060443d721f0f269f519046a9ee321
2016-12-09 10:00:41 +00:00
Hugo Benichi
11051ef7f8
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: 8436dae4c3 -s ours
...
am: 0bef352535 -s ours
Change-Id: I92e3730002c11f3c2d5ea9c324f61237190f44bc
2016-12-09 09:59:49 +00:00