Commit Graph

3311 Commits

Author SHA1 Message Date
Hugo Benichi
2d26b0e4b0 Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.

Test: verified that the test fails when reintroducing the format String
bug.
Bug: 33737715

(cherry picked from commit 3cb1d2b45d)

Change-Id: Ic2f23e860a17cb83b90edcfd2ba365134cacfe36
2017-01-16 15:15:26 +09:00
Etan Cohen
abccaf34c3 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 877ccf68fb am: 463d3c6e7c
am: 669e846a8a

Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac
2017-01-11 23:28:20 +00:00
Etan Cohen
669e846a8a Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 877ccf68fb
am: 463d3c6e7c

Change-Id: If2a6b632cd03984921572b190745865953a8e808
2017-01-11 23:22:51 +00: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
Lorenzo Colitti
8989d2edca Merge "Remove requestRouteToHost and {start,stop}UsingNetworkFeature." 2017-01-11 03:52:21 +00:00
Hugo Benichi
15b3116ba3 DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 22569ca49a -s ours am: b18218fb06 -s ours am: 57c7fc11bd
am: d3a305abc6  -s ours

Change-Id: Icf2ff95f201523d52a5089db80bc2bb4f7b28088
2017-01-11 01:51:09 +00:00
Hugo Benichi
bfc2783f9b DO NOT MERGE Captive portal systel log improvements am: fce1a04cc7 -s ours am: 73c57874b9 -s ours am: f258886732
am: 553ad7bcbe  -s ours

Change-Id: Iec0a3049392c38f1cc8ebce0983ea68cfc455cbc
2017-01-11 01:43:18 +00:00
Hugo Benichi
d3a305abc6 DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 22569ca49a -s ours am: b18218fb06 -s ours
am: 57c7fc11bd

Change-Id: I6f4c7a0c15373e56fc178f287f6a0eb54d0d4018
2017-01-11 01:42:01 +00:00
Hugo Benichi
a80c373a71 DO NOT MERGE Fix flaky IpPrefixTest. am: 79a968d619 -s ours am: 01eeebdf88 -s ours am: 5c3b167517
am: 61dce05929  -s ours

Change-Id: Ide65a8c7cad788c760c599f2569bc40922c26d60
2017-01-11 01:42:01 +00:00
Hugo Benichi
553ad7bcbe DO NOT MERGE Captive portal systel log improvements am: fce1a04cc7 -s ours am: 73c57874b9 -s ours
am: f258886732

Change-Id: Ie831b10e45cee740f519896312ede84ebb69e6f2
2017-01-11 01:32:49 +00:00
Hugo Benichi
61dce05929 DO NOT MERGE Fix flaky IpPrefixTest. am: 79a968d619 -s ours am: 01eeebdf88 -s ours
am: 5c3b167517

Change-Id: Ieeeb425675715dc9910c4901f9c1bce7dbd168ad
2017-01-11 01:31:54 +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
Lorenzo Colitti
443b6c4049 Temporarily restore the net.dnsX system properties.
This will limit app breakage in dogfood. The plan is to remove
these obsolete system properties again in O developer preview
builds so that application developers can move away from them.

Test: marlin boots and net.dnsX exists and is updated correctly

Bug: 33308258
Bug: 33807046
Bug: 34028616
Bug: 34115651
Change-Id: Iaf2fa213c314b7ba251c065b304e7e9869bafe9f
2017-01-06 03:09:18 +00:00
Lorenzo Colitti
84d7f0786a Remove requestRouteToHost and {start,stop}UsingNetworkFeature.
These APIs have been deprecated since L, and since M have thrown
IllegalArgumentException for apps targeting M or newer.

Test: API check passes.
Bug: 33607472
Change-Id: Ie582cac3872be21c51e1e37d16d7cfac496ed3e4
2017-01-05 17:39:21 +09: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
Hugo Benichi
bfcdbc7c4d NetworkNotificationManager: remove spammy log am: 02e5966fac
am: 29a41b05d1

Change-Id: I2b9b1b52e11ddf784244eedf1311f3b015841215
2016-12-22 03:07:19 +00:00
Hugo Benichi
29a41b05d1 NetworkNotificationManager: remove spammy log
am: 02e5966fac

Change-Id: I01785760854cd040c0d09f76e3832bbb7986dc4e
2016-12-22 03:02:39 +00:00
Hugo Benichi
02e5966fac NetworkNotificationManager: remove spammy log
Test: build, flashed, booted phone.
Bug: 32198726
Change-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5
2016-12-22 09:51:01 +09:00
Hugo Benichi
154d918bff DO NOT MERGE Stricter NetworkNotificationManagerTest am: 3cb1d2b45d
am: 4ff0a309da  -s ours

Change-Id: I5146235a579a66e8101106f288624fa2c00c4d43
2016-12-20 06:57:09 +00:00
Hugo Benichi
4ff0a309da DO NOT MERGE Stricter NetworkNotificationManagerTest
am: 3cb1d2b45d

Change-Id: I94ea5c6994d181e730ec4f49e98001eb81ed8740
2016-12-20 06:49:08 +00:00
Paul Stewart
17d1ae8473 DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java am: c39ecf10e0
am: 99ce10284e  -s ours

Change-Id: I3e94a34a2065939094f17f48383e2d9334d22f55
2016-12-20 05:12:30 +00:00
Joe LaPenna
102ef1c3f4 DO NOT MERGE Fix malformed log statement. am: 1360fb4b3b
am: b90b204141  -s ours

Change-Id: I9a6397cd16ba1f2ed0e21d8206d6c93b00778c91
2016-12-20 05:11:38 +00:00
Paul Stewart
99ce10284e DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
am: c39ecf10e0

Change-Id: I79c4129b861b9dd93ac14acce5a86aadd48e8d39
2016-12-20 05:04:46 +00:00
Joe LaPenna
b90b204141 DO NOT MERGE Fix malformed log statement.
am: 1360fb4b3b

Change-Id: Ie52f24f39305f325e01972f5046247482053db28
2016-12-20 05:04:02 +00:00
Hugo Benichi
3cb1d2b45d DO NOT MERGE Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.

Test: verified that the test fails when reintroducing the format String
bug.
Bug: 33737715

Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a
2016-12-20 05:02:28 +00:00
Paul Stewart
c39ecf10e0 DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
Commit fb2609d3eee1c7a4dda889c000f32183a044978a added a string
format which caused an exception.  On top of the fixes to this
from e1406167186c2cabe683b3c1511ad6733e9106c9, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW

(cherry picked from commit 835cb49639fc7cb75819564fa15f2f5a0bd5dee2)

Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36
2016-12-20 12:31:49 +09:00
Joe LaPenna
1360fb4b3b DO NOT MERGE Fix malformed log statement.
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f

BUG: 33746580

Test: built, triggered notification, no crash.

(cherry picked from commit e1406167186c2cabe683b3c1511ad6733e9106c9)

Change-Id: I50594ad865e6f95abc5c67c58af604ef2aa88f9b
2016-12-20 12:31:45 +09:00
Paul Stewart
c135a35fca Fix other String.format issues in NetworkNotificationManager.java
Commit fd35080555 added a string
format which caused an exception.  On top of the fixes to this
from 75017f83c7, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW
Change-Id: I13410ffebbc606b8801656ea0934f96ccd4b5357
2016-12-19 13:12:09 -08:00
TreeHugger Robot
384daf99a9 Merge "Fix malformed log statement." 2016-12-19 20:06:18 +00:00
Hugo Benichi
0aa9ad7480 Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev am: e1eeda60e9
am: 2eceb602b2

Change-Id: If2ba4a13847da63a8596195afbc302693c49eeb3
2016-12-19 18:43:55 +00:00
Hugo Benichi
d21499f812 DO NOT MERGE IP Connectivity metrics: add connect() statistics am: 3ffb9c2099
am: be1ee11ee7  -s ours

Change-Id: I667c809069821d722d912c68b04ebabf861617fc
2016-12-19 18:43:05 +00:00
Hugo Benichi
1be52957b0 DO NOT MERGE Fix IP connectivity metrics tests am: 9bf9c9b375
am: 9b3e6c82d1  -s ours

Change-Id: I5ccac93d3815a7ad967fa1494d6e48220beaf88b
2016-12-19 18:42:07 +00:00
Hugo Benichi
61b26c86e2 Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev am: bd60fb5863
am: 9371a57fe3

Change-Id: I31100e69ff88052daf387adf9063abdaa1ce4db2
2016-12-19 18:38:36 +00:00
Hugo Benichi
2bfbf8230f DO NOT MERGE Network notifications: revamp keying scheme am: e9c9d4bf0c
am: 4adf1530db  -s ours

Change-Id: Id9b2466b97aa706a57434520ffcec78140563e1c
2016-12-19 18:36:10 +00:00
Joe LaPenna
75017f83c7 Fix malformed log statement.
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f

BUG: 33746580

Test: built, triggered notification, no crash.

Change-Id: Ia3e5370f95a6cea421ae0d3febdc5e3fe156dceb
2016-12-19 10:35:10 -08:00
Hugo Benichi
322d340a9b DO NOT MERGE Unit tests for NetworkNotificationManager am: 3ca8a0d539
am: d7d78934af  -s ours

Change-Id: Idd8f1032790fea21bf69a7e8e00744f0a1e5c3c5
2016-12-19 18:33:39 +00:00
Hugo Benichi
924e436af8 Captive portals: login activity probes like NetworkMonitor am: 454e066e27
am: 7aefeec9b3

Change-Id: I57a5a1a92385d4a3bf2fdd6bedeaf93430ecc158
2016-12-19 18:29:41 +00:00
Hugo Benichi
2eceb602b2 Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
am: e1eeda60e9

Change-Id: Ia780475dbbd9ebd58f5bcc9cefa74108f48ca53b
2016-12-19 08:40:43 +00:00
Hugo Benichi
be1ee11ee7 DO NOT MERGE IP Connectivity metrics: add connect() statistics
am: 3ffb9c2099

Change-Id: I7ad93b1b3a3446ffd6dce7c0799ddb9a2b43955f
2016-12-19 08:40:37 +00:00
Hugo Benichi
9b3e6c82d1 DO NOT MERGE Fix IP connectivity metrics tests
am: 9bf9c9b375

Change-Id: Ia6a28b09263729caa72786062e134f8c684e3ccb
2016-12-19 08:39:55 +00:00
Hugo Benichi
e1eeda60e9 Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
* changes:
  DO NOT MERGE IP Connectivity metrics: add connect() statistics
  DO NOT MERGE Fix IP connectivity metrics tests
  DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
  DO NOT MERGE IP connectivity metrics: add transport field.
2016-12-19 08:31:17 +00:00