TreeHugger Robot
e4c59ebeaf
[automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e am: be93c81ba8 -s ours am: 6c043d219b -s ours
...
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 88fa813bd7
2020-04-30 04:18:54 +00:00
TreeHugger Robot
6c043d219b
[automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e am: be93c81ba8 -s ours
...
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 88fa813bd7
2020-04-30 03:55:16 +00:00
TreeHugger Robot
be93c81ba8
Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e
...
Change-Id: I613235e39111132b5627c5d72c2b2f589d5c9641
2020-04-30 03:35:14 +00:00
Chiachang Wang
3cb1e03082
Add test prefix into test cases
...
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
Change-Id: I6e18915e383ac20072cb238d0136d7a8e4ceb811
Merged-In: I6e18915e383ac20072cb238d0136d7a8e4ceb811
2020-04-30 02:38:18 +00:00
Chiachang Wang
242cfad7b2
Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4 am: 6c3df199cd am: e19fcdf1a5
...
Change-Id: I1c2352574ce92f2f030a01394ec4d35860053e73
2020-04-29 09:56:55 +00:00
Chiachang Wang
e19fcdf1a5
Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4 am: 6c3df199cd
...
Change-Id: Iff7435b20b830357a53f4773b211cd5ddc911ebd
2020-04-29 09:42:14 +00:00
Chiachang Wang
6c3df199cd
Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4
...
Change-Id: I85b8798fc82873d22c338937bb61092fbde259e6
2020-04-29 09:24:10 +00:00
Chiachang Wang
098a24b8d4
Merge changes I3525edc3,I6e18915e am: 7752ddf0b7
...
Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4
2020-04-29 09:08:45 +00:00
Chiachang Wang
7752ddf0b7
Merge changes I3525edc3,I6e18915e
...
* changes:
Filter debug entries for each vpn
Add test prefix into test cases
2020-04-29 08:43:02 +00:00
Chiachang Wang
1d5c290e38
Filter debug entries for each vpn
...
NetworkStats calculation needs to filter out debug entries to
prevent over counting. While NetworkStatsFactory migrates data
usage over a VPN to the TUN network, NetworkStatsFactory does
not filter out debug entries per vpn which will cause debug
entries left and cause exception.
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
and verify no exception
Change-Id: I3525edc385b07858b48c7add2d331c4b5a2e84ad
2020-04-29 15:07:45 +08:00
Chiachang Wang
88fa813bd7
Add test prefix into test cases
...
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
Change-Id: I6e18915e383ac20072cb238d0136d7a8e4ceb811
2020-04-29 13:44:50 +08:00
Benedict Wong
5afaa9119c
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: eb8393aa09 am: a7c8c64284 am: 60b787f922 am: 6cdb42012f
...
Change-Id: Id2ab17f49802d9213c255e0a485182edec25c88c
2020-04-28 19:07:23 +00:00
Benedict Wong
6cdb42012f
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: eb8393aa09 am: a7c8c64284 am: 60b787f922
...
Change-Id: Ic413b4638d37da94fa32ec2f81f9c570442be15a
2020-04-28 18:44:53 +00:00
Benedict Wong
60b787f922
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: eb8393aa09 am: a7c8c64284
...
Change-Id: I7ef93d318b795754eea3511caf7c3ae9187a88b2
2020-04-28 18:17:10 +00:00
Benedict Wong
a7c8c64284
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: eb8393aa09
...
Change-Id: Ib3e7bea4ad17eaf0b64bc157ed682c672a17f79a
2020-04-28 17:59:07 +00:00
Benedict Wong
eb8393aa09
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs"
2020-04-28 17:33:46 +00:00
Remi NGUYEN VAN
ed9082685b
Merge "Add comment / logging in NetworkMonitor callbacks" am: 34e9cb2fdc am: c7276dea28 am: c3f654ec97 am: 475dc719d6
...
Change-Id: Ic3f4623998b1381271a29f3ce969c63eb56ccd74
2020-04-27 08:38:38 +00:00
Remi NGUYEN VAN
475dc719d6
Merge "Add comment / logging in NetworkMonitor callbacks" am: 34e9cb2fdc am: c7276dea28 am: c3f654ec97
...
Change-Id: Ib8c7723cb873c7395b2eb33e3b259d13127cf73d
2020-04-27 08:21:54 +00:00
Remi NGUYEN VAN
c3f654ec97
Merge "Add comment / logging in NetworkMonitor callbacks" am: 34e9cb2fdc am: c7276dea28
...
Change-Id: I54f57b21e45a44d64f6601fecaa6f86207b513da
2020-04-27 08:08:57 +00:00
Remi NGUYEN VAN
c7276dea28
Merge "Add comment / logging in NetworkMonitor callbacks" am: 34e9cb2fdc
...
Change-Id: I8ba92e70462735961ae260234fc53f39e71994c5
2020-04-27 07:56:55 +00:00
Remi NGUYEN VAN
34e9cb2fdc
Merge "Add comment / logging in NetworkMonitor callbacks"
2020-04-27 07:26:25 +00:00
Benedict Wong
c668a1b4b3
Merge "Add tests for Tunnel, Transport mode application with released SPIs" am: 27a2f1dff8 am: aed6b6ff17 am: 9c42a8e601 am: 5b1ea13c26
...
Change-Id: I6a7ecbd207a3523d970da8a42dc20975a9aa4e6d
2020-04-25 00:06:46 +00:00
Benedict Wong
605a3dfac0
Merge "Use TransformRecord to get SPI instead of SpiRecord" am: 88c8a19311 am: fc7ba96b15 am: 25dec3b6e5 am: c43f7a8782
...
Change-Id: I7d39462903dce6ef0f68f73edfafdc6450464f36
2020-04-25 00:06:31 +00:00
Benedict Wong
5b1ea13c26
Merge "Add tests for Tunnel, Transport mode application with released SPIs" am: 27a2f1dff8 am: aed6b6ff17 am: 9c42a8e601
...
Change-Id: I8d17221fb833c63074815122b8d9d74ee80893ca
2020-04-24 23:50:10 +00:00
Benedict Wong
c43f7a8782
Merge "Use TransformRecord to get SPI instead of SpiRecord" am: 88c8a19311 am: fc7ba96b15 am: 25dec3b6e5
...
Change-Id: I2ffcf5466975d9a0f5491cf0dc4861afe28f9064
2020-04-24 23:49:59 +00:00
Benedict Wong
9c42a8e601
Merge "Add tests for Tunnel, Transport mode application with released SPIs" am: 27a2f1dff8 am: aed6b6ff17
...
Change-Id: I91a4f355cd2a397a9f24c0d5f5381a51523a1fe0
2020-04-24 23:27:48 +00:00
Benedict Wong
25dec3b6e5
Merge "Use TransformRecord to get SPI instead of SpiRecord" am: 88c8a19311 am: fc7ba96b15
...
Change-Id: Ibc3090627699aecb4ab5e183219b5848005d0412
2020-04-24 23:27:36 +00:00
Benedict Wong
aed6b6ff17
Merge "Add tests for Tunnel, Transport mode application with released SPIs" am: 27a2f1dff8
...
Change-Id: I60b9f6f52ba6aa64e6329f15ef1529b52c8a1b6a
2020-04-24 23:12:31 +00:00
Benedict Wong
fc7ba96b15
Merge "Use TransformRecord to get SPI instead of SpiRecord" am: 88c8a19311
...
Change-Id: If9d23537009ea1359d7dc198ba4662c85f8f4b0c
2020-04-24 23:12:27 +00:00
Benedict Wong
27a2f1dff8
Merge "Add tests for Tunnel, Transport mode application with released SPIs"
2020-04-24 22:32:41 +00:00
Benedict Wong
88c8a19311
Merge "Use TransformRecord to get SPI instead of SpiRecord"
2020-04-24 22:32:41 +00:00
Remi NGUYEN VAN
6d97a1dad7
Merge "Address comments on NetworkStack AIDL v6" am: 0e93810453 am: e468a26c7a am: 6819fe0fc9 am: 8d396480a0
...
Change-Id: I11e16ea5770223e963901784827f281246e460ad
2020-04-24 12:44:43 +00:00
Remi NGUYEN VAN
8d396480a0
Merge "Address comments on NetworkStack AIDL v6" am: 0e93810453 am: e468a26c7a am: 6819fe0fc9
...
Change-Id: I21b7e3b8199d8586345a9f6135b9a4dce8c53fcc
2020-04-24 12:32:43 +00:00
Remi NGUYEN VAN
6819fe0fc9
Merge "Address comments on NetworkStack AIDL v6" am: 0e93810453 am: e468a26c7a
...
Change-Id: Id385210ccd8d08bc2d15e964bbca25c452a3cde8
2020-04-24 12:19:37 +00:00
Remi NGUYEN VAN
e468a26c7a
Merge "Address comments on NetworkStack AIDL v6" am: 0e93810453
...
Change-Id: I755d14877a65b359c0837cab1488875d7238440e
2020-04-24 12:04:38 +00:00
Remi NGUYEN VAN
455b93d137
Add comment / logging in NetworkMonitor callbacks
...
Add a comment explaining the ordering of messages sent to the tracker
and connectivity diagnostics handlers.
Add a Slog.wtf call in case the deprecated notifyNetworkTested callback
is called.
Bug: 153500847
Test: atest ConnectivityServiceTest
Change-Id: I2dbfc9bf7b2f785ea4594851bd354e9fd0fc0bd1
2020-04-24 20:56:39 +09:00
Remi NGUYEN VAN
0e93810453
Merge "Address comments on NetworkStack AIDL v6"
2020-04-24 11:56:32 +00:00
Remi NGUYEN VAN
9b647ca69a
Address comments on NetworkStack AIDL v6
...
Address issues found during AIDL review:
- Rename clientAddr to singleClientAddr
- Do not use a ParcelableBundle for notifyNetworkTested or
notifyDataStallSuspected; instead use AIDL parcelables for stronger
backwards compatibility guarantees.
Test: atest NetworkMonitorTest ConnectivityServiceTest
ConnectivityServiceIntegrationTest, manual
Bug: 153500847
Change-Id: Id9b71784e5f6294d203230e57737979e063ff0f8
2020-04-24 18:52:02 +09:00
TreeHugger Robot
7f22279ce2
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 89930cbb29 -s ours am: 331bac0c28 -s ours am: 4750adbcf4 -s ours
...
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 82948ddb1c
2020-04-24 06:57:47 +00:00
TreeHugger Robot
439c5d28d6
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 89930cbb29 am: b09dd19436 -s ours am: cfc19a31e5 -s ours
...
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 82948ddb1c
2020-04-24 06:57:22 +00:00
TreeHugger Robot
4750adbcf4
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 89930cbb29 -s ours am: 331bac0c28 -s ours
...
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 82948ddb1c
2020-04-24 06:42:28 +00:00
TreeHugger Robot
cfc19a31e5
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 89930cbb29 am: b09dd19436 -s ours
...
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 82948ddb1c
2020-04-24 06:42:05 +00:00
TreeHugger Robot
b09dd19436
Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 89930cbb29
...
Change-Id: I87c6ff9698d9f8fadea6139359f7479a72adc965
2020-04-24 06:27:51 +00:00
TreeHugger Robot
331bac0c28
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 89930cbb29 -s ours
...
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 82948ddb1c
2020-04-24 06:27:15 +00:00
TreeHugger Robot
89930cbb29
Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev
2020-04-24 06:15:13 +00:00
Automerger Merge Worker
4678e6eb98
Merge "[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac97692 -s ours am: 8089ad19cd -s ours" into rvc-d1-dev-plus-aosp am: de02b2b652 -s ours
...
am skip reason: Change-Id Iade6a5b355b8812a5eb191345dfe393938ee272c with SHA-1 22ef3a8747
2020-04-24 02:17:44 +00:00
TreeHugger Robot
cfc953f59a
[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac97692 am: 5d74bf5bca -s ours am: d5f616f711 -s ours
...
am skip reason: Change-Id Iade6a5b355b8812a5eb191345dfe393938ee272c with SHA-1 de4a675836
2020-04-24 02:15:47 +00:00
TreeHugger Robot
5db80c1ff1
[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac97692 -s ours am: 8089ad19cd -s ours
...
am skip reason: Change-Id Iade6a5b355b8812a5eb191345dfe393938ee272c with SHA-1 de4a675836
2020-04-24 01:50:46 +00:00
TreeHugger Robot
d5f616f711
[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac97692 am: 5d74bf5bca -s ours
...
am skip reason: Change-Id Iade6a5b355b8812a5eb191345dfe393938ee272c with SHA-1 de4a675836
2020-04-24 01:50:30 +00:00
TreeHugger Robot
8089ad19cd
[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac97692 -s ours
...
am skip reason: Change-Id Iade6a5b355b8812a5eb191345dfe393938ee272c with SHA-1 de4a675836
2020-04-24 01:35:00 +00:00
