Commit Graph

10290 Commits

Author SHA1 Message Date
Treehugger Robot
fcb4c2e9af Merge "Add test for NetworkSpecifier" am: 453a16c2e2 am: b6c55b0a45 am: d785b599a8 am: 6cf22ba23b am: 8f39a8cee3
Change-Id: Ic670c355f661928483e42bc35b9a52d1d529a603
2020-04-23 15:48:31 +00:00
Treehugger Robot
8f39a8cee3 Merge "Add test for NetworkSpecifier" am: 453a16c2e2 am: b6c55b0a45 am: d785b599a8 am: 6cf22ba23b
Change-Id: I38e061b8c7b09c5a379730011cb48322e9b3b5c2
2020-04-23 15:26:51 +00:00
Treehugger Robot
6cf22ba23b Merge "Add test for NetworkSpecifier" am: 453a16c2e2 am: b6c55b0a45 am: d785b599a8
Change-Id: I3ad1426aea8340a844f703c877ff732ffc57c528
2020-04-23 15:07:52 +00:00
Treehugger Robot
d785b599a8 Merge "Add test for NetworkSpecifier" am: 453a16c2e2 am: b6c55b0a45
Change-Id: I094afdcb65946deba7fa744f4ed1eb7532b93b27
2020-04-23 14:50:25 +00:00
Treehugger Robot
b6c55b0a45 Merge "Add test for NetworkSpecifier" am: 453a16c2e2
Change-Id: I04cc2a0aad319e4266253267cacaecb517ec6efc
2020-04-23 14:31:52 +00:00
Treehugger Robot
453a16c2e2 Merge "Add test for NetworkSpecifier" 2020-04-23 14:12:37 +00:00
Chiachang Wang
2bdc9ffbf3 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
34f81b7321 [automerger skipped] Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: fd6a76dafc am: 0a2c689963 am: ba43d2b37f am: 76f57e2eee -s ours
am skip reason: Change-Id I33f787644c44d7b0e5ce17a433820cfcd985cdfb with SHA-1 ddbcf5bf77 is in history

Change-Id: I6c81d6429f63ea3c011763fa6de2de37fbbb9c58
2020-04-22 15:50:45 +00:00
Philip P. Moltmann
76f57e2eee Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: fd6a76dafc am: 0a2c689963 am: ba43d2b37f
Change-Id: Ia85e514b6981949733a3f2649648a6731310e462
2020-04-22 15:43:49 +00:00
Philip P. Moltmann
ba43d2b37f Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: fd6a76dafc am: 0a2c689963
Change-Id: I9ab0540ee40b9466926f9703b42d79c22e0c16ec
2020-04-22 15:32:28 +00:00
Philip P. Moltmann
0a2c689963 Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: fd6a76dafc
Change-Id: I099944752fc3006c1e98750dd46dbebf5e50789f
2020-04-22 15:19:14 +00:00
Philip P. Moltmann
fd6a76dafc Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b
Change-Id: I3ddd8954cf8443f549f7965cc43f2600bf92a80b
2020-04-22 15:09:28 +00:00
Philip P. Moltmann
0578c80ec9 Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" 2020-04-22 14:57:49 +00:00
Philip P. Moltmann
ddbcf5bf77 Set attributionTag for noteOp(WRITE_SETTINGS) calls
Test: atest FrameworksNetTests
Bug: 136595429
Change-Id: I33f787644c44d7b0e5ce17a433820cfcd985cdfb
Exempt-From-Owner-Approval: Merge from AOSP
2020-04-21 21:46:34 +00:00
Lorenzo Colitti
32f98c3c7e [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 am: 87c0d4df18 -s ours am: 02917c1f19 -s ours am: 905ac5a575 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 c44662351e is in history

Change-Id: I17000290c08653233ae12b970fb20ed32512eb64
2020-04-21 10:55:37 +00:00
Lorenzo Colitti
3cfbeb7e1a [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d am: 02a3cb88e4 -s ours am: a186c73174 -s ours am: 0726fce28e -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 e0084efb28 is in history

Change-Id: I643772731adb2ddfced208cb90bb7dd2aa99d8eb
2020-04-21 10:55:27 +00:00
TreeHugger Robot
28815c7fe2 [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 1943988c6c am: 3c7cd0b000 -s ours am: 9f4372c9bc -s ours am: 9c1831c6ca -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 efd9d6903a is in history

Change-Id: I9bd162fada056ea67c7440edea966f99bc85a8a7
2020-04-21 10:54:39 +00:00
Lorenzo Colitti
dc94bb2178 [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 am: fbae8c5f26 -s ours am: 4517689dc1 -s ours am: 3f1d98482c -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 c2c962ef08 is in history

Change-Id: Ifc580e18b16e3d38b18c27b4f229a64e93b2b275
2020-04-21 10:54:07 +00:00
Lorenzo Colitti
905ac5a575 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 am: 87c0d4df18 -s ours am: 02917c1f19 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 c44662351e is in history

Change-Id: Ie776e2aa8db68f217e1efaa4ac3069c36b8c201c
2020-04-21 10:43:45 +00:00
Lorenzo Colitti
0726fce28e [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d am: 02a3cb88e4 -s ours am: a186c73174 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 e0084efb28 is in history

Change-Id: I534a3ce679c438944ebaceb53419a99048cecc8f
2020-04-21 10:43:27 +00:00
TreeHugger Robot
9c1831c6ca [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 1943988c6c am: 3c7cd0b000 -s ours am: 9f4372c9bc -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 efd9d6903a is in history

Change-Id: Id5279c51a1918cc1a4ef1be31292c62792baaeb1
2020-04-21 10:42:55 +00:00
Lorenzo Colitti
02917c1f19 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 am: 87c0d4df18 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 c44662351e is in history

Change-Id: I1a0002840b3163a04bea0681225f0c27831ad1a3
2020-04-21 10:31:50 +00:00
Lorenzo Colitti
a186c73174 [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d am: 02a3cb88e4 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 e0084efb28 is in history

Change-Id: I39611a9002c5d30ae8f5dd7e680da2c7efbd6248
2020-04-21 10:31:40 +00:00
TreeHugger Robot
9f4372c9bc [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 1943988c6c am: 3c7cd0b000 -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 efd9d6903a is in history

Change-Id: Id0b95eb38cb198a48b1d879ce8482657b4d8b1f4
2020-04-21 10:31:28 +00:00
Lorenzo Colitti
3f1d98482c [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 am: fbae8c5f26 -s ours am: 4517689dc1 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 c2c962ef08 is in history

Change-Id: Id96fb58802faa2322449a03b13aff9c0ec2466b2
2020-04-21 10:27:39 +00:00
Lorenzo Colitti
87c0d4df18 Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001
Change-Id: If85833c1a62b96830cbfeea7bd734190b2d8f1c3
2020-04-21 10:25:44 +00:00
Lorenzo Colitti
02a3cb88e4 Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d
Change-Id: I733c6565f93a6ab7e19b39f86a3c90837cfa4485
2020-04-21 10:23:37 +00:00
TreeHugger Robot
3c7cd0b000 Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 1943988c6c
Change-Id: I57c49e657d1d07d4c15df4893c9e9f3fe984aa11
2020-04-21 10:23:10 +00:00
Lorenzo Colitti
4517689dc1 [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 am: fbae8c5f26 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 c2c962ef08 is in history

Change-Id: Ic8af70ae1a29cda5cc6ef33f885db3532037de81
2020-04-21 10:21:53 +00:00
Lorenzo Colitti
fbae8c5f26 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
bbf050b58d 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
c59be94c6b [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 -s ours am: 4fc0376da3 -s ours am: 9f50308450 -s ours am: bcb7d6d7c7 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 d8911baa45 is in history

Change-Id: I0d42f788c38977ccda481f927dc5befa5c3ed527
2020-04-20 15:27:24 +00:00
Lorenzo Colitti
30444270e3 [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d -s ours am: a864001e97 -s ours am: 36bf65dadb -s ours am: 83e2ab836c -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 1076d22c37 is in history

Change-Id: I7294e2009aa208efb81ac8774fd76c30a0f615b1
2020-04-20 15:26:53 +00:00
TreeHugger Robot
6d0db3c951 [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 1943988c6c -s ours am: b037f4ba9c -s ours am: 510473aac8 -s ours am: 586fdbf5ec -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 efd9d6903a is in history

Change-Id: I1af541535bff3909ab7d934129edb16295af3b63
2020-04-20 15:26:28 +00:00
Lorenzo Colitti
bcb7d6d7c7 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 -s ours am: 4fc0376da3 -s ours am: 9f50308450 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 d8911baa45 is in history

Change-Id: I6943661de46008f5565887648fd63c9a4fd2819c
2020-04-20 15:16:59 +00:00
Lorenzo Colitti
83e2ab836c [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d -s ours am: a864001e97 -s ours am: 36bf65dadb -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 1076d22c37 is in history

Change-Id: I46755f44a36489590d51008245625f204ca1933c
2020-04-20 15:16:40 +00:00
TreeHugger Robot
586fdbf5ec [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 1943988c6c -s ours am: b037f4ba9c -s ours am: 510473aac8 -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 efd9d6903a is in history

Change-Id: I99392bbfffe5603e20c598348d25dfbfd7639af5
2020-04-20 15:16:22 +00:00
Lorenzo Colitti
9f50308450 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 -s ours am: 4fc0376da3 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 d8911baa45 is in history

Change-Id: I1ab9d8f022fb7fab636fe7b03ead1d7d3f97aeef
2020-04-20 14:49:39 +00:00
Lorenzo Colitti
36bf65dadb [automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d -s ours am: a864001e97 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 1076d22c37 is in history

Change-Id: I96feccdbe7ad16d3b1670d439a404aaa27b485b1
2020-04-20 14:49:04 +00:00
TreeHugger Robot
510473aac8 [automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 1943988c6c -s ours am: b037f4ba9c -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 efd9d6903a is in history

Change-Id: I05d9159176a01ef6d840eb81a4b737c42366fca3
2020-04-20 14:47:26 +00:00
Lorenzo Colitti
2fcc2f6d05 [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 -s ours am: 98955c3f79 -s ours am: 1a05283dd0 -s ours am: c29acb29a2 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 54fb93fbde is in history

Change-Id: I4c8f97887bc902532b77e16871c5c0fa732e479c
2020-04-20 14:31:31 +00:00
Lorenzo Colitti
4fc0376da3 [automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 d8911baa45 is in history

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

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

Change-Id: I2fc90cbe6f01ba42a6ac47859d07ea3f4da8fb11
2020-04-20 14:30:34 +00:00
Lorenzo Colitti
a314315001 Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev 2020-04-20 14:29:29 +00:00
Lorenzo Colitti
6a3e78a97d Merge "Make the Nat464Xlat tests more realistic." into rvc-dev 2020-04-20 14:19:53 +00:00
TreeHugger Robot
1943988c6c Merge "Add network agent to enhance NetworkProvider test" into rvc-dev 2020-04-20 14:18:10 +00:00
Lorenzo Colitti
c29acb29a2 [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 -s ours am: 98955c3f79 -s ours am: 1a05283dd0 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 54fb93fbde is in history

Change-Id: I075ba95c969ded0d3d35abc861802f584f86de61
2020-04-20 14:12:33 +00:00
Lorenzo Colitti
1a05283dd0 [automerger skipped] Merge "Support learning the NAT64 prefix from two different sources." into rvc-dev am: 4f7f6d67e9 -s ours am: 98955c3f79 -s ours
am skip reason: Change-Id Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902 with SHA-1 54fb93fbde is in history

Change-Id: Id0c91aa087b90efc608f63f7ce0f133c0d7a59de
2020-04-20 14:04:25 +00:00
Lorenzo Colitti
98955c3f79 [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 54fb93fbde is in history

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