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
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
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
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
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
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
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
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
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
8009d903e1
DO NOT MERGE Captive portal systel log improvements
...
am: 35ee7fd62e
Change-Id: Icbba206e8c035f566ff6d9e500d972a3dcf65bb6
2016-12-13 00:32:46 +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
6b92566b1e
Merge changes from topic 'framework-net-aosp' am: 16193a27e6 am: 1a2fa0f372
...
am: ec55edefc7
Change-Id: Idb0e86655f5d4f835796f5ebe31da99e419d66bf
2016-12-09 10:53:48 +00:00
Hugo Benichi
dde56579a3
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: b10b3e9c14 -s ours am: 9f65f04157 -s ours
...
am: c2b724e114
Change-Id: Ib6a8f4b7ca365ab5cb42b9e57311228be273075a
2016-12-09 10:40:12 +00:00
Hugo Benichi
82758595c0
DO NOT MERGE: Netd events: record connect() success/errno am: 565f0b2d66 -s ours am: d84f932680 -s ours
...
am: d090bd44dd
Change-Id: Ic83b2d46bc4d25878c70c0a02d39f14ecbeab84f
2016-12-09 10:39:20 +00:00
Tony Mak
c28ed9fe4c
DO NOT MERGE: Show notification for always-on app VPN am: 7b6200aa9f -s ours am: 118071a481 -s ours
...
am: 39c1b059d6
Change-Id: I871444d296f0c49f587e98d1e0b760846da37c13
2016-12-09 10:37:38 +00:00
Stephen Chen
f785613fb2
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 0889b39d2c -s ours am: 3f5785260e -s ours
...
am: a3430519b3
Change-Id: Ic0f11bdb50d43c0dd9c449ae3c784b0214b865e3
2016-12-09 10:36:45 +00:00
Hugo Benichi
a2cb5accc6
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: aadb059a9f -s ours am: a30ae5542b -s ours
...
am: 8f56a5e39e
Change-Id: Iebd06f7c03b2068314c24a14a2b38d2413b88536
2016-12-09 10:32:40 +00:00
Hugo Benichi
a6c0fe058b
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: d0f492a893 -s ours am: 0bef352535 -s ours
...
am: 5ace8e7dca
Change-Id: I7379d8223778d3f2df97d88c0d6f291df219c579
2016-12-09 10:31:27 +00:00
Felipe Leme
a0a8c6d749
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: 8d517776e8 -s ours am: fbbaf25665 -s ours
...
am: 0404016147
Change-Id: I4aa888c55824eba58b7e0af78b510a144608e704
2016-12-09 10:28:28 +00:00
Felipe Leme
36f31949b8
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: 0e6e089843 -s ours am: b296948b3b -s ours
...
am: f346ceece7
Change-Id: Icaa4e18775b6e810738fb9d180ea20f7ce5c4506
2016-12-09 10:27:35 +00:00
Felipe Leme
ead62d1cd7
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: bf499379b8 -s ours am: 82393f7b98 -s ours
...
am: e5f4778f04
Change-Id: I4acc3df60493e5ac388772f8c0e22ac92bc3ce4c
2016-12-09 10:26:08 +00:00
Jeremy Joslin
a66df62191
DO NOT MERGE: VPN network stat accounting changes. am: 71f79690a7 -s ours am: 12bb3f057b -s ours
...
am: 4abd92e917
Change-Id: Ie33371e7e4e47071aa9f74fef93ddf2cff2ec57a
2016-12-09 10:25:17 +00:00
Hugo Benichi
fdc2f1e075
DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: e5ef0ce33c -s ours am: f6cb43ae32 -s ours
...
am: cc374542ca
Change-Id: I121ad24bed0fa12b80110b1058ad4279ec9c0107
2016-12-09 10:24:20 +00:00
Hugo Benichi
2744db6456
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 94e0d04479 -s ours am: 7337239702 -s ours
...
am: 5617d4ef19
Change-Id: If52ab02bd501d4b071f24ddf8abdfe344e7358eb
2016-12-09 10:23:28 +00:00
Hugo Benichi
46ed74c3d3
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 515e786cfd -s ours am: ef148edaa2 -s ours
...
am: b6574912aa
Change-Id: I7c177123057676622e1aa43c68676ee06ed60ee6
2016-12-09 10:22:25 +00:00
Jeremy Klein
4ce8d89299
DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: d0542adb0b -s ours am: 3cd1ae2261 -s ours
...
am: 7a9bc9c4a3
Change-Id: I897f28d2b002e1a2aa6be8ec423a1c9b1d5b761b
2016-12-09 10:20:04 +00:00
Lorenzo Colitti
ec55edefc7
Merge changes from topic 'framework-net-aosp' am: 16193a27e6
...
am: 1a2fa0f372
Change-Id: I746ee7fd37946df2ba31ca8aee928fa3ef04591c
2016-12-09 10:18:11 +00:00
Hugo Benichi
c2b724e114
DO NOT MERGE: frameworks-test: adding missing @SmallTest am: b10b3e9c14 -s ours
...
am: 9f65f04157 -s ours
Change-Id: I717dbbd4d3ed657fec9ed9f45a5ae6f3e2a04b3e
2016-12-09 10:08:43 +00:00