Etan Cohen
89cec191a8
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 4aaaa99c3d am: 34d83975fe
...
am: 2635c03fda
Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac
2017-01-11 23:28:20 +00:00
Etan Cohen
2635c03fda
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 4aaaa99c3d
...
am: 34d83975fe
Change-Id: If2a6b632cd03984921572b190745865953a8e808
2017-01-11 23:22:51 +00: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
Lorenzo Colitti
8ecbfcb60c
Merge "Remove requestRouteToHost and {start,stop}UsingNetworkFeature."
2017-01-11 03:52:21 +00:00
Hugo Benichi
e6a6f4f52d
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 9019f5d0eb -s ours am: 26e2c619c0 -s ours am: 89cbf02bab
...
am: 44e0a7fbe7 -s ours
Change-Id: Icf2ff95f201523d52a5089db80bc2bb4f7b28088
2017-01-11 01:51:09 +00:00
Hugo Benichi
90095f7b4e
DO NOT MERGE Captive portal systel log improvements am: 5ca0b9ce20 -s ours am: 1367239bb2 -s ours am: b26f13f2da
...
am: 48e2d8f7db -s ours
Change-Id: Iec0a3049392c38f1cc8ebce0983ea68cfc455cbc
2017-01-11 01:43:18 +00:00
Hugo Benichi
44e0a7fbe7
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 9019f5d0eb -s ours am: 26e2c619c0 -s ours
...
am: 89cbf02bab
Change-Id: I6f4c7a0c15373e56fc178f287f6a0eb54d0d4018
2017-01-11 01:42:01 +00:00
Hugo Benichi
b58b6730ff
DO NOT MERGE Fix flaky IpPrefixTest. am: b3d00ef8c8 -s ours am: d07a77a40c -s ours am: cc673e7e95
...
am: 2d622e1367 -s ours
Change-Id: Ide65a8c7cad788c760c599f2569bc40922c26d60
2017-01-11 01:42:01 +00:00
Hugo Benichi
48e2d8f7db
DO NOT MERGE Captive portal systel log improvements am: 5ca0b9ce20 -s ours am: 1367239bb2 -s ours
...
am: b26f13f2da
Change-Id: Ie831b10e45cee740f519896312ede84ebb69e6f2
2017-01-11 01:32:49 +00:00
Hugo Benichi
2d622e1367
DO NOT MERGE Fix flaky IpPrefixTest. am: b3d00ef8c8 -s ours am: d07a77a40c -s ours
...
am: cc673e7e95
Change-Id: Ieeeb425675715dc9910c4901f9c1bce7dbd168ad
2017-01-11 01:31:54 +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
Lorenzo Colitti
aefac392ea
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
7cb18342a6
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
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
Hugo Benichi
cdb61441a0
NetworkNotificationManager: remove spammy log am: 9430f95c21
...
am: 08e147a7d0
Change-Id: I2b9b1b52e11ddf784244eedf1311f3b015841215
2016-12-22 03:07:19 +00:00
Hugo Benichi
08e147a7d0
NetworkNotificationManager: remove spammy log
...
am: 9430f95c21
Change-Id: I01785760854cd040c0d09f76e3832bbb7986dc4e
2016-12-22 03:02:39 +00:00
Hugo Benichi
9430f95c21
NetworkNotificationManager: remove spammy log
...
Test: build, flashed, booted phone.
Bug: 32198726
Change-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5
2016-12-22 09:51:01 +09:00
Hugo Benichi
792ab20c1b
DO NOT MERGE Stricter NetworkNotificationManagerTest am: 85a6c96ef3
...
am: b2966ad433 -s ours
Change-Id: I5146235a579a66e8101106f288624fa2c00c4d43
2016-12-20 06:57:09 +00:00
Hugo Benichi
b2966ad433
DO NOT MERGE Stricter NetworkNotificationManagerTest
...
am: 85a6c96ef3
Change-Id: I94ea5c6994d181e730ec4f49e98001eb81ed8740
2016-12-20 06:49:08 +00:00
Paul Stewart
ec9400abde
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java am: f2e4cc9037
...
am: 3d205c909c -s ours
Change-Id: I3e94a34a2065939094f17f48383e2d9334d22f55
2016-12-20 05:12:30 +00:00
Joe LaPenna
3f887b32db
DO NOT MERGE Fix malformed log statement. am: d7423d12a9
...
am: c4a0d516ce -s ours
Change-Id: I9a6397cd16ba1f2ed0e21d8206d6c93b00778c91
2016-12-20 05:11:38 +00:00
Paul Stewart
3d205c909c
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
...
am: f2e4cc9037
Change-Id: I79c4129b861b9dd93ac14acce5a86aadd48e8d39
2016-12-20 05:04:46 +00:00
Joe LaPenna
c4a0d516ce
DO NOT MERGE Fix malformed log statement.
...
am: d7423d12a9
Change-Id: Ie52f24f39305f325e01972f5046247482053db28
2016-12-20 05:04:02 +00:00
Hugo Benichi
85a6c96ef3
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
f2e4cc9037
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
...
Commit 51727428fc added a string
format which caused an exception. On top of the fixes to this
from 5a45327352 , 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 e46b47d85d )
Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36
2016-12-20 12:31:49 +09:00
Joe LaPenna
d7423d12a9
DO NOT MERGE Fix malformed log statement.
...
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f
BUG: 33746580
Test: built, triggered notification, no crash.
(cherry picked from commit 5a45327352 )
Change-Id: I50594ad865e6f95abc5c67c58af604ef2aa88f9b
2016-12-20 12:31:45 +09:00
Paul Stewart
e46b47d85d
Fix other String.format issues in NetworkNotificationManager.java
...
Commit 51727428fc added a string
format which caused an exception. On top of the fixes to this
from 5a45327352 , 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
e086224118
Merge "Fix malformed log statement."
2016-12-19 20:06:18 +00:00
Hugo Benichi
b23ddb27d0
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev am: e22193d8a9
...
am: 659e125e11
Change-Id: If2ba4a13847da63a8596195afbc302693c49eeb3
2016-12-19 18:43:55 +00:00
Hugo Benichi
54b028b3b8
DO NOT MERGE IP Connectivity metrics: add connect() statistics am: 845c1a3b0b
...
am: 65e291c235 -s ours
Change-Id: I667c809069821d722d912c68b04ebabf861617fc
2016-12-19 18:43:05 +00:00
Hugo Benichi
9cbdc7d833
DO NOT MERGE Fix IP connectivity metrics tests am: 0ef1916103
...
am: bf7ad49e3e -s ours
Change-Id: I5ccac93d3815a7ad967fa1494d6e48220beaf88b
2016-12-19 18:42:07 +00:00
Hugo Benichi
baacbffbf4
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev am: 704a627973
...
am: 1f4238f593
Change-Id: I31100e69ff88052daf387adf9063abdaa1ce4db2
2016-12-19 18:38:36 +00:00
Hugo Benichi
62d242340d
DO NOT MERGE Network notifications: revamp keying scheme am: 6cccb3bec3
...
am: a7c95ac2cb -s ours
Change-Id: Id9b2466b97aa706a57434520ffcec78140563e1c
2016-12-19 18:36:10 +00:00
Joe LaPenna
5a45327352
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
a68bf9adea
DO NOT MERGE Unit tests for NetworkNotificationManager am: f9b95ad8f3
...
am: 567cf7c47d -s ours
Change-Id: Idd8f1032790fea21bf69a7e8e00744f0a1e5c3c5
2016-12-19 18:33:39 +00:00
Hugo Benichi
08ad0b7525
Captive portals: login activity probes like NetworkMonitor am: dce21c52bf
...
am: 9061297f0d
Change-Id: I57a5a1a92385d4a3bf2fdd6bedeaf93430ecc158
2016-12-19 18:29:41 +00:00
Hugo Benichi
659e125e11
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
...
am: e22193d8a9
Change-Id: Ia780475dbbd9ebd58f5bcc9cefa74108f48ca53b
2016-12-19 08:40:43 +00:00
Hugo Benichi
65e291c235
DO NOT MERGE IP Connectivity metrics: add connect() statistics
...
am: 845c1a3b0b
Change-Id: I7ad93b1b3a3446ffd6dce7c0799ddb9a2b43955f
2016-12-19 08:40:37 +00:00
Hugo Benichi
bf7ad49e3e
DO NOT MERGE Fix IP connectivity metrics tests
...
am: 0ef1916103
Change-Id: Ia6a28b09263729caa72786062e134f8c684e3ccb
2016-12-19 08:39:55 +00:00
Hugo Benichi
e22193d8a9
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
Hugo Benichi
1f4238f593
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
...
am: 704a627973
Change-Id: I09bbd93408e2de8b4ce159a7b22d3650a04ba081
2016-12-19 08:29:30 +00:00