Commit graph

9,888 commits

Message SHA1
[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 -s ours am: ba26c4d385 -s ours
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 4eebd7214f is in history

Change-Id: Ic713dcd96b22fb286f916ebe8bdb8b513ff5d551

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-30 06:41:23 +00:00
c75c8ccf0c
[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 am: a2191260ad -s ours
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history

Change-Id: I1b2900d70d1c326428f51f0c4ed28049aabd33ef

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-30 06:41:05 +00:00
d34db354ba
Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976
Change-Id: I58b6863e5f8417368c7cd83edc487404d5156e99

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-30 06:19:07 +00:00
a2191260ad
[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 -s ours
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history

Change-Id: I34895c81e5abfe3baf155582cf557ce909af5965

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-30 06:18:35 +00:00
ba26c4d385
Merge "Address comments on NetworkStack AIDL v6" into rvc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-04-30 06:02:32 +00:00
3551e00976
[automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b am: 89036a2ee6 -s ours
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history

Change-Id: I18fb4a1783592319fd0e90ce76eb9c14636652b2

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 04:35:17 +00:00
43b57333c7
[automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours am: d8a94b47d9 -s ours
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history

Change-Id: I4fe424305ea9af7c41033bd6cb7f52ef8f30c37a

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 04:35:04 +00:00
3f642b5f99
Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b
Change-Id: I0b1a9b7ffc65bfa6c784ec215e64371ab8d14e93

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 04:20:40 +00:00
89036a2ee6
[automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history

Change-Id: I89ff9147f99b03c5bd1e7f5aa34c5968cfbfc18e

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 04:20:28 +00:00
d8a94b47d9
[automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e -s ours am: 5e7d209cb5 -s ours
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history

Change-Id: Ie788afa31c9bbc975ca2b580a9f35d369c021fbe

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 03:55:38 +00:00
0fce670efc
[automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e am: 28341da5f1 -s ours
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history

Change-Id: Ic2ac01065a112c54e0aa0de91008883c8572d5a6

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 03:55:16 +00:00
6c836011cf
Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e
Change-Id: I613235e39111132b5627c5d72c2b2f589d5c9641

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 03:35:14 +00:00
28341da5f1
[automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e -s ours
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history

Change-Id: Ib69e3996287d6469e2baa5fa6a3837d2e01bc197

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-30 03:34:36 +00:00
5e7d209cb5
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
Merged-In: I3525edc385b07858b48c7add2d331c4b5a2e84ad

Chiachang Wang   commited 2020-04-30 02:39:15 +00:00
61d8a11ea9
Add test prefix into test cases
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
Change-Id: I6e18915e383ac20072cb238d0136d7a8e4ceb811
Merged-In: I6e18915e383ac20072cb238d0136d7a8e4ceb811

Chiachang Wang   commited 2020-04-30 02:38:18 +00:00
a92a825412
Merge changes I3525edc3,I6e18915e am: c2e56739dc am: 11ed6b71d4 am: 15694d6d85
Change-Id: Iff7435b20b830357a53f4773b211cd5ddc911ebd

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-04-29 09:42:14 +00:00
8a29060fb7
Merge changes I3525edc3,I6e18915e am: c2e56739dc am: 11ed6b71d4
Change-Id: I85b8798fc82873d22c338937bb61092fbde259e6

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-04-29 09:24:10 +00:00
15694d6d85
Merge changes I3525edc3,I6e18915e am: c2e56739dc
Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-04-29 09:08:45 +00:00
11ed6b71d4
Merge changes I3525edc3,I6e18915e
* changes:
  Filter debug entries for each vpn
  Add test prefix into test cases

Chiachang Wang   authored and   Gerrit Code Review   commited 2020-04-29 08:43:02 +00:00
c2e56739dc
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

Chiachang Wang   commited 2020-04-29 15:07:45 +08:00
aec798b639
Add test prefix into test cases
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
Change-Id: I6e18915e383ac20072cb238d0136d7a8e4ceb811

Chiachang Wang   commited 2020-04-29 13:44:50 +08:00
5c8e3be449
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05 am: ebb01b6fd8 am: 8ee3575ab8
Change-Id: Ic413b4638d37da94fa32ec2f81f9c570442be15a

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-28 18:44:53 +00:00
c1e107e076
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05 am: ebb01b6fd8
Change-Id: I7ef93d318b795754eea3511caf7c3ae9187a88b2

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-28 18:17:10 +00:00
8ee3575ab8
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05
Change-Id: Ib3e7bea4ad17eaf0b64bc157ed682c672a17f79a

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-28 17:59:07 +00:00
ebb01b6fd8
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs"
Benedict Wong   authored and   Gerrit Code Review   commited 2020-04-28 17:33:46 +00:00
7e37275b05
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
Merged-In: Id9b71784e5f6294d203230e57737979e063ff0f8
Change-Id: Id9b71784e5f6294d203230e57737979e063ff0f8

Remi NGUYEN VAN   commited 2020-04-28 08:09:17 +00:00
4eebd7214f
Merge "Add comment / logging in NetworkMonitor callbacks" am: b6acc7f50e am: 12a06589bd am: edd659040c
Change-Id: Ib8c7723cb873c7395b2eb33e3b259d13127cf73d

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-27 08:21:54 +00:00
8a3fb20cd2
Merge "Add comment / logging in NetworkMonitor callbacks" am: b6acc7f50e am: 12a06589bd
Change-Id: I54f57b21e45a44d64f6601fecaa6f86207b513da

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-27 08:08:57 +00:00
edd659040c
Merge "Add comment / logging in NetworkMonitor callbacks" am: b6acc7f50e
Change-Id: I8ba92e70462735961ae260234fc53f39e71994c5

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-27 07:56:55 +00:00
12a06589bd
Merge "Add comment / logging in NetworkMonitor callbacks"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-04-27 07:26:25 +00:00
b6acc7f50e
Merge "Add tests for Tunnel, Transport mode application with released SPIs" am: 5536bbaead am: a6a499d5ba am: ad2ce88db7
Change-Id: I8d17221fb833c63074815122b8d9d74ee80893ca

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-24 23:50:10 +00:00
e80f0a3c3c
Merge "Use TransformRecord to get SPI instead of SpiRecord" am: 5839ef2fef am: a0a6eca5fa am: 3d71e7060a
Change-Id: I2ffcf5466975d9a0f5491cf0dc4861afe28f9064

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-24 23:49:59 +00:00
d943731cd1
Merge "Add tests for Tunnel, Transport mode application with released SPIs" am: 5536bbaead am: a6a499d5ba
Change-Id: I91a4f355cd2a397a9f24c0d5f5381a51523a1fe0

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-24 23:27:48 +00:00
ad2ce88db7
Merge "Use TransformRecord to get SPI instead of SpiRecord" am: 5839ef2fef am: a0a6eca5fa
Change-Id: Ibc3090627699aecb4ab5e183219b5848005d0412

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-24 23:27:36 +00:00
3d71e7060a
Merge "Add tests for Tunnel, Transport mode application with released SPIs" am: 5536bbaead
Change-Id: I60b9f6f52ba6aa64e6329f15ef1529b52c8a1b6a

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-24 23:12:31 +00:00
a6a499d5ba
Merge "Use TransformRecord to get SPI instead of SpiRecord" am: 5839ef2fef
Change-Id: If9d23537009ea1359d7dc198ba4662c85f8f4b0c

Benedict Wong   authored and   Automerger Merge Worker   commited 2020-04-24 23:12:27 +00:00
a0a6eca5fa
Merge "Add tests for Tunnel, Transport mode application with released SPIs"
Benedict Wong   authored and   Gerrit Code Review   commited 2020-04-24 22:32:41 +00:00
5536bbaead
Merge "Use TransformRecord to get SPI instead of SpiRecord"
Benedict Wong   authored and   Gerrit Code Review   commited 2020-04-24 22:32:41 +00:00
5839ef2fef
Merge "Address comments on NetworkStack AIDL v6" am: bfc85a162a am: d9dfaa7035 am: cecde2dc27
Change-Id: I21b7e3b8199d8586345a9f6135b9a4dce8c53fcc

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-24 12:32:43 +00:00
1f9bb21adc
Merge "Address comments on NetworkStack AIDL v6" am: bfc85a162a am: d9dfaa7035
Change-Id: Id385210ccd8d08bc2d15e964bbca25c452a3cde8

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-24 12:19:37 +00:00
cecde2dc27
Merge "Address comments on NetworkStack AIDL v6" am: bfc85a162a
Change-Id: I755d14877a65b359c0837cab1488875d7238440e

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-04-24 12:04:38 +00:00
d9dfaa7035
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

Remi NGUYEN VAN   commited 2020-04-24 20:56:39 +09:00
fb0774ead9
Merge "Address comments on NetworkStack AIDL v6"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-04-24 11:56:32 +00:00
bfc85a162a
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

Remi NGUYEN VAN   commited 2020-04-24 18:52:02 +09:00
e15e61e712
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 3d66e42610 -s ours am: 6001174c97 -s ours
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 b124dcff2c is in history

Change-Id: I9809898d5d1a2ffb532a2e7f2b19b9d8a713d53d

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-24 06:42:28 +00:00
9db2744107
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 3d66e42610 am: e81d2b9421 -s ours
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 b124dcff2c is in history

Change-Id: Icbc989b0ce35ead3a2f2647a8b1eb6a7cdc79371

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-24 06:42:05 +00:00
d07dba6b0a
Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 3d66e42610
Change-Id: I87c6ff9698d9f8fadea6139359f7479a72adc965

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-24 06:27:51 +00:00
e81d2b9421
[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 3d66e42610 -s ours
am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 b124dcff2c is in history

Change-Id: Ic43fce861a3a36e58fea0307e659d82530275b70

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-24 06:27:15 +00:00
6001174c97
Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-04-24 06:15:13 +00:00
3d66e42610
[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac97692 -s ours am: 85d5f0584a -s ours
am skip reason: Change-Id Iade6a5b355b8812a5eb191345dfe393938ee272c with SHA-1 2bdc9ffbf3 is in history

Change-Id: I43dcf3a1a255f3d7ef370194f876b9b20faa3b47

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-04-24 01:50:46 +00:00
7f1362e434