Commit Graph

10406 Commits

Author SHA1 Message Date
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
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
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 is in history

Change-Id: I9809898d5d1a2ffb532a2e7f2b19b9d8a713d53d
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 is in history

Change-Id: Icbc989b0ce35ead3a2f2647a8b1eb6a7cdc79371
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 is in history

Change-Id: Ic43fce861a3a36e58fea0307e659d82530275b70
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
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 is in history

Change-Id: I43dcf3a1a255f3d7ef370194f876b9b20faa3b47
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 is in history

Change-Id: I89d7b9123b746ef03fe34d099111a3240ec2285f
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 is in history

Change-Id: I4840ddb2b49eaae662263ba43458ce6c2155bc70
2020-04-24 01:35:00 +00:00
TreeHugger Robot
5d74bf5bca Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac97692
Change-Id: I0e345d63b92fa83c4aa274481f9c669db24eb1f3
2020-04-24 01:34:51 +00:00
Treehugger Robot
22ef3a8747 Add test for NetworkSpecifier
Tests for canBeSatisfiedBy() and redact()

Bug: 154686765
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkSpecifierTest
Change-Id: Iade6a5b355b8812a5eb191345dfe393938ee272c
Merged-In: Iade6a5b355b8812a5eb191345dfe393938ee272c
(cherry picked from commit ae84f1ac325e54f021c720744c787b66525d12ea)
2020-04-24 00:09:55 +00:00
Treehugger Robot
07e82716e1 Merge "Add test for NetworkSpecifier" am: 93c21fc7b5 am: 1a01782799 am: 2fcf27dcf8
Change-Id: I3ad1426aea8340a844f703c877ff732ffc57c528
2020-04-23 15:07:52 +00:00
Treehugger Robot
2fcf27dcf8 Merge "Add test for NetworkSpecifier" am: 93c21fc7b5 am: 1a01782799
Change-Id: I094afdcb65946deba7fa744f4ed1eb7532b93b27
2020-04-23 14:50:25 +00:00
Treehugger Robot
1a01782799 Merge "Add test for NetworkSpecifier" am: 93c21fc7b5
Change-Id: I04cc2a0aad319e4266253267cacaecb517ec6efc
2020-04-23 14:31:52 +00:00
Treehugger Robot
93c21fc7b5 Merge "Add test for NetworkSpecifier" 2020-04-23 14:12:37 +00:00
Chiachang Wang
de4a675836 Add test for NetworkSpecifier
Tests for canBeSatisfiedBy() and redact()

Bug: 154686765
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkSpecifierTest
Change-Id: Iade6a5b355b8812a5eb191345dfe393938ee272c
2020-04-23 18:03:16 +08:00
Philip P. Moltmann
e895d8343d Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: 7b3866f284 am: 84091e184a
Change-Id: I9ab0540ee40b9466926f9703b42d79c22e0c16ec
2020-04-22 15:32:28 +00:00
Philip P. Moltmann
84091e184a Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: 7b3866f284
Change-Id: I099944752fc3006c1e98750dd46dbebf5e50789f
2020-04-22 15:19:14 +00:00
Philip P. Moltmann
7b3866f284 Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b
Change-Id: I3ddd8954cf8443f549f7965cc43f2600bf92a80b
2020-04-22 15:09:28 +00:00
Lorenzo Colitti
6daf05c882 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: 83eb86b247 am: a7068abb33 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 c9016cafe3 is in history

Change-Id: I1a0002840b3163a04bea0681225f0c27831ad1a3
2020-04-21 10:31:50 +00:00
Lorenzo Colitti
3330938849 [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 840bb2ea6f am: ec9291dea8 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 1c0d43fc15 is in history

Change-Id: I39611a9002c5d30ae8f5dd7e680da2c7efbd6248
2020-04-21 10:31:40 +00:00
TreeHugger Robot
9922765c24 [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: eb92e57996 am: 5bf2f09286 -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 8d2f514530 is in history

Change-Id: Id0b95eb38cb198a48b1d879ce8482657b4d8b1f4
2020-04-21 10:31:28 +00:00
Lorenzo Colitti
a7068abb33 Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: 83eb86b247
Change-Id: If85833c1a62b96830cbfeea7bd734190b2d8f1c3
2020-04-21 10:25:44 +00:00
Lorenzo Colitti
ec9291dea8 Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 840bb2ea6f
Change-Id: I733c6565f93a6ab7e19b39f86a3c90837cfa4485
2020-04-21 10:23:37 +00:00
TreeHugger Robot
5bf2f09286 Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: eb92e57996
Change-Id: I57c49e657d1d07d4c15df4893c9e9f3fe984aa11
2020-04-21 10:23:10 +00:00
Lorenzo Colitti
7463ef7894 [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 am: 5cb69679b1 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 4308bfc4f0 is in history

Change-Id: Ic8af70ae1a29cda5cc6ef33f885db3532037de81
2020-04-21 10:21:53 +00:00
Lorenzo Colitti
5cb69679b1 Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9
Change-Id: I930d63aa0364a20141cd8e096a1a8b88e3b81fa7
2020-04-21 10:21:08 +00:00
Philip P. Moltmann
7bc33dfb89 Set attributionTag for noteOp(WRITE_SETTINGS) calls
Test: atest FrameworksNetTests TetheringTests:TetheringServiceTest
Bug: 136595429
Merged-In: I33f787644c44d7b0e5ce17a433820cfcd985cdfb
Change-Id: Ic3d937e7bb5141798234ed5b2852c1f768e97495
2020-04-20 18:00:03 -07:00
Lorenzo Colitti
d6a7bb02f4 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: 83eb86b247 -s ours am: 9442426f95 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 38c6519a90 is in history

Change-Id: I1ab9d8f022fb7fab636fe7b03ead1d7d3f97aeef
2020-04-20 14:49:39 +00:00
Lorenzo Colitti
d24e81a8f0 [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 840bb2ea6f -s ours am: 4396dc8bf5 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 c6bd5847c9 is in history

Change-Id: I96feccdbe7ad16d3b1670d439a404aaa27b485b1
2020-04-20 14:49:04 +00:00
TreeHugger Robot
8c1afd8f76 [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: eb92e57996 -s ours am: 8e83e30fbb -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 8d2f514530 is in history

Change-Id: I05d9159176a01ef6d840eb81a4b737c42366fca3
2020-04-20 14:47:26 +00:00
Lorenzo Colitti
9442426f95 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: 83eb86b247 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 38c6519a90 is in history

Change-Id: Ia03b25467390136e847f1ecde7e4f1cbe5ee6451
2020-04-20 14:31:07 +00:00
Lorenzo Colitti
4396dc8bf5 [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 840bb2ea6f -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 c6bd5847c9 is in history

Change-Id: Ib62c56f16ad3df8a98038271ea5d57e0ed189192
2020-04-20 14:30:55 +00:00
TreeHugger Robot
8e83e30fbb [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: eb92e57996 -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 8d2f514530 is in history

Change-Id: I2fc90cbe6f01ba42a6ac47859d07ea3f4da8fb11
2020-04-20 14:30:34 +00:00
Lorenzo Colitti
83eb86b247 Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev 2020-04-20 14:29:29 +00:00
Lorenzo Colitti
840bb2ea6f Merge "Make the Nat464Xlat tests more realistic." into rvc-dev 2020-04-20 14:19:53 +00:00
TreeHugger Robot
eb92e57996 Merge "Add network agent to enhance NetworkProvider test" into rvc-dev 2020-04-20 14:18:10 +00:00
Lorenzo Colitti
87a848e31b [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 -s ours am: b2a05e3c42 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 e2eade021a is in history

Change-Id: Id0c91aa087b90efc608f63f7ce0f133c0d7a59de
2020-04-20 14:04:25 +00:00
Lorenzo Colitti
b2a05e3c42 [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 e2eade021a is in history

Change-Id: I6724e192ae3ad62fd44ead33369f76c9d7709525
2020-04-20 13:56:13 +00:00