Commit Graph

3278 Commits

Author SHA1 Message Date
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
Joe LaPenna
c4a0d516ce DO NOT MERGE Fix malformed log statement.
am: d7423d12a9

Change-Id: Ie52f24f39305f325e01972f5046247482053db28
2016-12-20 05:04:02 +00: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
Hugo Benichi
a7c95ac2cb DO NOT MERGE Network notifications: revamp keying scheme
am: 6cccb3bec3

Change-Id: Ibad7d0210b2c69826462b781f43a82d65849ebfb
2016-12-19 08:29:23 +00:00
Hugo Benichi
567cf7c47d DO NOT MERGE Unit tests for NetworkNotificationManager
am: f9b95ad8f3

Change-Id: I873ea4a5625c526d61017967604305ada548f907
2016-12-19 08:29:11 +00:00
Hugo Benichi
704a627973 Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
* changes:
  DO NOT MERGE Network notifications: revamp keying scheme
  DO NOT MERGE Define Network notification proto constants.
  DO NOT MERGE Unit tests for NetworkNotificationManager
2016-12-19 08:25:32 +00:00
Hugo Benichi
9061297f0d Captive portals: login activity probes like NetworkMonitor
am: dce21c52bf

Change-Id: Ie85df7dd734b872cc361d0820edbfffc928f9f3a
2016-12-19 02:07:41 +00:00
Hugo Benichi
dce21c52bf 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
Change-Id: I33cbcdab9809c712d998da6d925bdd4e3093f8ff
2016-12-19 09:19:13 +09:00
Mark Lu
893dcb17ac Merge "docs: changes to broadcast documentation am: e1682a08b7 am: 538a5cf796 am: c4fe74f7f2" into nyc-mr2-dev-plus-aosp
am: 6fb51da60a

Change-Id: I2fcd1cda185dc2b3583624ea1ad08e0bcde9a28f
2016-12-16 05:31:35 +00:00
Mark Lu
dd266bcf6a docs: changes to broadcast documentation am: e1682a08b7 am: 538a5cf796 am: c4fe74f7f2
am: fa02b61bd9

Change-Id: Ib6e3f02b97b57a6cb0bed778fed97f39367ad372
2016-12-16 05:31:26 +00:00
Mark Lu
a35f0ad98f docs: changes to broadcast documentation am: e1682a08b7 am: 538a5cf796 am: 2157cf135a
am: 3dffb146df

Change-Id: I2dcb6bc7f8ebf385bc7d6a571a760c140a65e9fb
2016-12-16 05:30:20 +00:00
Android Build Merger (Role)
6fb51da60a Merge "docs: changes to broadcast documentation am: e1682a08b7 am: 538a5cf796 am: c4fe74f7f2" into nyc-mr2-dev-plus-aosp 2016-12-16 05:15:15 +00:00
Mark Lu
fa02b61bd9 docs: changes to broadcast documentation am: e1682a08b7 am: 538a5cf796
am: c4fe74f7f2

Change-Id: I84b0410fcef3bea08c5636927864298d30989308
2016-12-16 05:14:40 +00:00
Mark Lu
3dffb146df docs: changes to broadcast documentation am: e1682a08b7 am: 538a5cf796
am: 2157cf135a

Change-Id: I18b47ba01b0af8882c25526d8823f263f456aae2
2016-12-16 05:14:34 +00: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
c4fe74f7f2 docs: changes to broadcast documentation am: e1682a08b7
am: 538a5cf796

Change-Id: I7dcb1bc57fb62f2b177c7ad15a9236da98fb749f
2016-12-16 05:06:37 +00:00
Mark Lu
538a5cf796 docs: changes to broadcast documentation
am: e1682a08b7

Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
2016-12-16 04:59:08 +00:00
TreeHugger Robot
05d915adba Merge "IP Connectivity metrics: add connect() statistics" 2016-12-15 16:09:18 +00:00
Hugo Benichi
845c1a3b0b DO NOT MERGE IP Connectivity metrics: add connect() statistics
This patch adds a ConnectStats class to aggregate connect() statistics
gathered in NetdEventListenerService. ConnectStats is uploaded once a
day by IpConnectivityMetrics.

Test: $ runtest frameworks-net + new unit test
Bug: 32198976

(cherry picked from commit 4f71a15973f7048076ed10f63d708f020e1a21e0)

Change-Id: I1450c126b90b628d9f1c73ddf054b4742f5e84c5
2016-12-15 22:56:36 +09:00
Hugo Benichi
c1329a2874 IP Connectivity metrics: add connect() statistics
This patch adds a ConnectStats class to aggregate connect() statistics
gathered in NetdEventListenerService. ConnectStats is uploaded once a
day by IpConnectivityMetrics.

Test: $ runtest frameworks-net + new unit test
Bug: 32198976
Change-Id: Iea63339035415513a5ba0ff4b8f4d79f75fc652d
2016-12-15 22:53:53 +09:00
Erik Kline
028fa0af62 Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a am: 479b8c3a2c am: 86abfb03b9
am: cecf9952da

Change-Id: Icd6e6452cfb2f1ee460851db95fa42f8d25f3279
2016-12-15 12:43:16 +00:00
Erik Kline
cecf9952da Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a am: 479b8c3a2c
am: 86abfb03b9

Change-Id: I05da79d601d412270a71026bbbad3c516a785422
2016-12-15 12:35:13 +00:00
Hugo Benichi
0ef1916103 DO NOT MERGE Fix IP connectivity metrics tests
So that test assumptions match previous changes in ipconnectivity.proto.

This patch also tags metrics tests with @SmallTest.

Test: $ runtest frameworks-net
Bug: 32561414
Bug: 32198976

(cherry picked from commit 1fb81a644e)

Change-Id: I8926a92248ac2d46fc78749afc40bc5f0de10878
2016-12-15 21:31:25 +09: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
Hugo Benichi
6cccb3bec3 DO NOT MERGE Network notifications: revamp keying scheme
This patch changes the (tag: String, id: Int) keying scheme for network
notifications so that TRON notification counters can count network
related notifications unambiguously.

TRON instruments all notifications shown for package "android" as well
as user interactions with these Notifications. These counters are
grouped by id. However the network notifications ("no internet" dialog,
"captive portal sign in" dialog, ...) use a static tag and a dynamic id
for keying notifications, preventing the counters to correctly
aggregate. In addition there is also the risk of collision with other
SystemUi notification ids not managed by NetworkNotificationManager.

In order to make the TRON counters useful for network notifications,
the id is now encoding the network notification type in a stable way
while the tag is used to uniquely identify network notifications.

Test: change covered by previously added new unit tests.
Bug: 32198726
Bug: 33030620

(cherry picked from commit 51727428fc)

Change-Id: Iadf7f15da38de28587090ed0395f15c24d4ad442
2016-12-15 20:31:11 +09:00
Erik Kline
bfdf051585 Have IpManager track L2-L4 signaling traffic required for IP connectivity. am: 4adb18679e
am: cdb620fbcb

Change-Id: Iccd81c5d722a14409fc4f22bc34c3607bca653da
2016-12-15 10:21:08 +00:00
Erik Kline
cdb620fbcb Have IpManager track L2-L4 signaling traffic required for IP connectivity.
am: 4adb18679e

Change-Id: Ie95309464d8f368f5040c74b59daba9700191e86
2016-12-15 10:13:36 +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
TreeHugger Robot
b10d6c022e Merge "Network notifications: revamp keying scheme" 2016-12-15 09:26:58 +00:00
Erik Kline
4adb18679e 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 17:16:48 +09:00
Erik Kline
eb20d07be1 Merge "More correct startup and shutdown procedures." am: 0530b1e65d am: 22c6c1a5b2 am: fec0502419
am: 7590d5d5ba

Change-Id: Ia55c27ee51892a7dc29f2e1f1379eb8312cf3cb3
2016-12-15 05:47:25 +00:00
Erik Kline
7590d5d5ba Merge "More correct startup and shutdown procedures." am: 0530b1e65d am: 22c6c1a5b2
am: fec0502419

Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8
2016-12-15 05:40:17 +00: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
Hugo Benichi
f9b95ad8f3 DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 20904677af)

Change-Id: Ib8a725cdd8c708ccb9cffad62321e0db8b27e593
2016-12-15 14:32:02 +09:00