Commit Graph

3231 Commits

Author SHA1 Message Date
TreeHugger Robot
b10d6c022e Merge "Network notifications: revamp keying scheme" 2016-12-15 09:26:58 +00: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
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
Hugo Benichi
51727428fc 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
Change-Id: I1201d1d4fab8183dd83449c2afb2c35cfece883f
2016-12-15 10:31:38 +09:00
Erik Kline
04ad778465 Merge "More correct startup and shutdown procedures." into nyc-mr2-dev am: ae8bdd4525
am: 14b5952d9b

Change-Id: I1385649a71bdba3f19fd863bd4a3ace66d56b568
2016-12-14 11:47:22 +00:00
Erik Kline
b9631bfd28 More correct startup and shutdown procedures. am: af209807ce
am: 205f7599df

Change-Id: I5096f6a6f3d42bd55b9d3c80e279f2ee2fb0a795
2016-12-14 11:46:26 +00:00
Erik Kline
14b5952d9b Merge "More correct startup and shutdown procedures." into nyc-mr2-dev
am: ae8bdd4525

Change-Id: Ib017af2b267689c0833b92c13f29da1d2e69a011
2016-12-14 11:39:44 +00:00
Erik Kline
205f7599df More correct startup and shutdown procedures.
am: af209807ce

Change-Id: Ib488e0cb49da2d3f655e189600f839721ea73358
2016-12-14 11:39:36 +00:00
TreeHugger Robot
ae8bdd4525 Merge "More correct startup and shutdown procedures." into nyc-mr2-dev 2016-12-14 11:33:38 +00:00
Michal Karpinski
94ecf621a5 DO NOT MERGE [DPM] DO can start network logging and listen for events am: 7260c83c0d
am: fbffd00d49  -s ours

Change-Id: I4fbfb006f8d5d398cae5e593fd4ce905b6c50f94
2016-12-14 11:08:38 +00:00
Michal Karpinski
fbffd00d49 DO NOT MERGE [DPM] DO can start network logging and listen for events
am: 7260c83c0d

Change-Id: I7952d67d22a141040f3ee3ac2b6c3aa2cfccbbf7
2016-12-14 10:50:36 +00:00
Erik Kline
af209807ce 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.

Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
2016-12-14 18:53:26 +09:00
Erik Kline
e4bb6883da Merge "Stop setting net.hostname" am: 042b78ef5e am: 06c37fff06 am: 2c062156df
am: 4559839045

Change-Id: Id89ab1373d9cf633d9fae45131f18eabc200a8f9
2016-12-14 08:21:04 +00:00
Erik Kline
4559839045 Merge "Stop setting net.hostname" am: 042b78ef5e am: 06c37fff06
am: 2c062156df

Change-Id: I9976537d761a761e9aeca5cb15298f689032664f
2016-12-14 08:13:30 +00: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
Michal Karpinski
7260c83c0d DO NOT MERGE [DPM] DO can start network logging and listen for events
This CL adds:
1) Setter and getter in DPM to manipulate logging switch (retrieval
method to come in a subsequent CL(s)).
2) A way for DPM to register to listen for events.
3) Skeleton of NetworkLogger class (more to come in subsequent CL(s)).

Bug: 29748723
Change-Id: I5c04662ccc6febd2ba294b0eaca1ed1da9c16e47
2016-12-13 17:15:38 +00:00
Hugo Benichi
2294097af9 Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev am: 8c584ea6d6
am: f35e5b53cd  -s ours

Change-Id: I9810fd2fec02285cc8c09ed10cb8386fadd15738
2016-12-13 04:23:21 +00:00
Hugo Benichi
9b1aa389ad DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents am: 9f5013b6c0
am: 4232499973  -s ours

Change-Id: Ie3547d74cdbf3a5333f3951b9375b00224c2ecd0
2016-12-13 04:22:20 +00:00
Hugo Benichi
482ef5782c Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev am: 0acf1bcab5
am: 39338dd610  -s ours

Change-Id: I1ad2490adc9266aeba0dd0b47c965ba395784106
2016-12-13 04:21:18 +00:00
Hugo Benichi
2ba4a738cd DO NOT MERGE IpConnectivityMetrics reads buffer size in settings am: 96a0e1f8c4
am: 5597ac3f99  -s ours

Change-Id: Iecbd16612359797223c1a8b2885f20bdcc71b543
2016-12-13 04:20:19 +00:00
Hugo Benichi
b57848f571 DO NOT MERGE IpConnectivity metrics: add version number am: d5dbca9b15
am: 72d7ed9e37  -s ours

Change-Id: I3c7e1476cf46cd03ea77b3a9bdcf30264fe2bcd7
2016-12-13 04:16:21 +00:00
Hugo Benichi
f35e5b53cd Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev
am: 8c584ea6d6

Change-Id: If2878fe4eec7683077be32bf167e7a309035c7ce
2016-12-13 04:09:56 +00:00
Hugo Benichi
4232499973 DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents
am: 9f5013b6c0

Change-Id: I266f7b8da58513b1e6c1a9c2b37e528ba777a7d6
2016-12-13 04:09:49 +00:00
Hugo Benichi
39338dd610 Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev
am: 0acf1bcab5

Change-Id: I24685ad75f67a59e20190c5dbb28ef43fa5bc8f4
2016-12-13 04:08:26 +00:00
Hugo Benichi
5597ac3f99 DO NOT MERGE IpConnectivityMetrics reads buffer size in settings
am: 96a0e1f8c4

Change-Id: I5c433faa0d43202ae1169fdba4c42c09dd9c17dd
2016-12-13 04:08:18 +00:00
Hugo Benichi
72d7ed9e37 DO NOT MERGE IpConnectivity metrics: add version number
am: d5dbca9b15

Change-Id: Iccdf7d09ef4dc80f05c76774c456b5effb2c08c7
2016-12-13 04:05:08 +00:00
Hugo Benichi
8f9caaca7a Merge "Fix IP connectivity metrics tests" 2016-12-13 03:56:53 +00:00
Hugo Benichi
8c584ea6d6 Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev 2016-12-13 03:55:32 +00:00
Hugo Benichi
0acf1bcab5 Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev 2016-12-13 03:54:24 +00:00
Hugo Benichi
399e0903e6 Merge "Unit tests for NetworkNotificationManager" 2016-12-13 02:23:05 +00:00
Hugo Benichi
9f5013b6c0 DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402

(cherry picked from commit 811c4cec75)

Change-Id: Ibe41e9a76db36ea502697a5f19fc0d91c40a3087
2016-12-13 10:20:03 +09:00
Hugo Benichi
96a0e1f8c4 DO NOT MERGE IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry pick from commit d5f78a08b4)

Change-Id: Ie7ca1638533479601c5983bb6e54705003561b6c
2016-12-13 10:20:03 +09:00
Hugo Benichi
d5dbca9b15 DO NOT MERGE IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906

(cherry picked from commit 79a739cbf3)

Change-Id: I5f37633afd9ec82f5402c5b6670fe2febae82a14
2016-12-13 10:19:13 +09:00
Hugo Benichi
d776210a26 DO NOT MERGE Captive portal systel log improvements am: 35ee7fd62e
am: 8009d903e1  -s ours

Change-Id: Id6c15e6ed64f460f7f08c7358c751c1ab6dc8d2e
2016-12-13 00:43:49 +00:00
Hugo Benichi
8009d903e1 DO NOT MERGE Captive portal systel log improvements
am: 35ee7fd62e

Change-Id: Icbba206e8c035f566ff6d9e500d972a3dcf65bb6
2016-12-13 00:32:46 +00:00
Erik Kline
728ae18d2a Merge "Stop setting net.dns{1234} system properties." am: 2ecbd49edd am: 62f75e995a am: e17f2b6a8b
am: b33ceca786

Change-Id: I63216568d2ec5606fdfe108d0263714238dc1886
2016-12-12 08:48:21 +00:00
Erik Kline
b33ceca786 Merge "Stop setting net.dns{1234} system properties." am: 2ecbd49edd am: 62f75e995a
am: e17f2b6a8b

Change-Id: I38d6608f64076ffa3300255eb66c51c32e590b0f
2016-12-12 08:41:47 +00: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
Treehugger Robot
2ecbd49edd Merge "Stop setting net.dns{1234} system properties." 2016-12-12 08:16:35 +00:00
Lorenzo Colitti
549b1d6803 Merge changes from topic 'framework-net-aosp' am: 16193a27e6 am: 1a2fa0f372 am: ec55edefc7
am: 6b92566b1e

Change-Id: Ic6ee235cfbe3eea990f729de36119f8ce12a6a17
2016-12-09 11:25:03 +00:00
Hugo Benichi
5cd4b8d93c DO NOT MERGE: frameworks-test: adding missing @SmallTest am: b10b3e9c14 -s ours am: 9f65f04157 -s ours am: c2b724e114
am: dde56579a3  -s ours

Change-Id: I349be4850debbdb6403ebf31d4478e800391bec5
2016-12-09 11:14:43 +00:00
Hugo Benichi
4436fec0e5 DO NOT MERGE: Netd events: record connect() success/errno am: 565f0b2d66 -s ours am: d84f932680 -s ours am: d090bd44dd
am: 82758595c0  -s ours

Change-Id: I04204d67dc2fb5b58d4769e69e905733e4e81f1e
2016-12-09 11:13:19 +00:00