Commit Graph

43432 Commits

Author SHA1 Message Date
Luke Huang
7aad6dd5fc Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca am: 614299c262
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018

Change-Id: I0aa928303428b875c0be0618e04d5940b1b26eed
2021-06-13 17:39:41 +00:00
Luke Huang
614299c262 Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018

Change-Id: I2fb0ac98d2f7ae2a2fab3af7bc657f013b59bbc2
2021-06-13 16:52:06 +00:00
Luke Huang
31f8527bca Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018

Change-Id: I7f81b5f807114c223f53fe8417d904c4dbe5cb39
2021-06-13 16:09:50 +00:00
Luke Huang
c9a2bdf2b9 Merge "Modify NsdServiceTest to conform to its new mechanism" 2021-06-13 15:20:52 +00:00
Frank Li
9dd2f85c82 Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d am: 2cb6dca3f6 am: 2348b4a8ae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395

Change-Id: Ia7dafe703e9ff2579c57e3a2d130ac6db2e47d46
2021-06-12 13:39:35 +00:00
Frank Li
2348b4a8ae Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d am: 2cb6dca3f6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395

Change-Id: Ib6eb34ccff924606dc404076f4421e62d13e902d
2021-06-12 13:25:22 +00:00
Frank Li
2cb6dca3f6 Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395

Change-Id: I2ce2517dd8657316d9d8e57e85cf1d8026845be6
2021-06-12 13:14:36 +00:00
Frank Li
67fe28455d Merge "Add test for ConnectivityService API isPrivateDnsBroken" 2021-06-12 13:02:24 +00:00
TreeHugger Robot
796ddc71cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours am: d033292467 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: Ia2c67638f31dae6d504f77a30f5d036bc477fd2a
2021-06-11 17:52:43 +00:00
TreeHugger Robot
f9f1101006 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours am: 07478c2a7b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: I117702539d9fb8a31a42170f400c1516913d0ccd
2021-06-11 17:45:13 +00:00
TreeHugger Robot
d033292467 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: I312ea41fb1556dcfc23d1ce2ec2e214022a90f79
2021-06-11 17:35:44 +00:00
TreeHugger Robot
07478c2a7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: I0a96d6ff8e9517f45b948f60b7473542d9f2109b
2021-06-11 17:34:10 +00:00
TreeHugger Robot
0ced5b5e8b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-11 17:21:37 +00:00
TreeHugger Robot
c62ad1960e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f259e4fa82 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945624

Change-Id: Ib9d62db4305e33f64a4ef26fb8bdeb9fb48c6606
2021-06-11 17:15:18 +00:00
TreeHugger Robot
f259e4fa82 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-11 17:00:32 +00:00
Bill Yi
e421b1eaad Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie74e329e714a4399f121546b858154098e8c60c0
2021-06-11 10:00:29 +00:00
Bill Yi
d7ec12e91d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ice6b9421c94bb6253595e955e9585eab2115ff61
2021-06-11 09:59:22 +00:00
Treehugger Robot
7e45643ed9 [automerger skipped] import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786 am: 5bfdca6367 -s ours
am skip reason: Merged-In Ib943321d46254ba64ce206fb9e3b3414d15e4d45 with SHA-1 348d144786 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I965ab59c5bef34c1ac34bed2304e0ffbb4a2d6ab
2021-06-11 04:15:20 +00:00
Treehugger Robot
50e9a4a2c0 [automerger skipped] import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786 -s ours am: dc841076f1 -s ours
am skip reason: Merged-In Ib943321d46254ba64ce206fb9e3b3414d15e4d45 with SHA-1 23f5d805ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I54fb1ba5ca1e1e600f3915bd88994be16e23729a
2021-06-11 04:09:43 +00:00
Treehugger Robot
5bfdca6367 import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I4b34a9e6879db1d38f44d06f89a809802bf32aa1
2021-06-11 03:57:42 +00:00
Treehugger Robot
dc841076f1 [automerger skipped] import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786 -s ours
am skip reason: Merged-In Ib943321d46254ba64ce206fb9e3b3414d15e4d45 with SHA-1 23f5d805ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I02ee29d7e6458a49278aed987d8b8366edaa9da1
2021-06-11 03:56:50 +00:00
Remi NGUYEN VAN
4bb45d88ea Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e am: 9134dac0b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372

Change-Id: Ie28db4a25144eb558bb3c7c72e24c66a38091e2c
2021-06-11 02:12:04 +00:00
Remi NGUYEN VAN
9134dac0b1 Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372

Change-Id: I8c8a2f734c433c0cf6fe158fcbf26a75a82d0d0a
2021-06-11 01:56:43 +00:00
Remi NGUYEN VAN
6f6035a29e Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372

Change-Id: I0b5b976cf9de9beb0db7eca9205196a5afd3eab6
2021-06-11 01:38:23 +00:00
Remi NGUYEN VAN
a6c06af0fa Merge "Revert "Use mockito-extended in FrameworksNetTests"" 2021-06-11 01:26:44 +00:00
Remi NGUYEN VAN
7a80ae85d6 Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a am: 45dd5391ed
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772

Change-Id: Ie41a3726bd3f90a957e2507c0c2f90c5024440e4
2021-06-11 00:19:41 +00:00
Remi NGUYEN VAN
45dd5391ed Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772

Change-Id: Ice0291696167275ae20a423b74671d252fe09fb4
2021-06-11 00:05:52 +00:00
Remi NGUYEN VAN
3cc611d69a Merge changes I8d15b626,I993e8da9 am: d15e52eca9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772

Change-Id: I5bfe6d82ce37628a8b7dfec59f9a8216a3c5dcdf
2021-06-10 23:50:06 +00:00
Remi NGUYEN VAN
d15e52eca9 Merge changes I8d15b626,I993e8da9
* changes:
  Revert "Remove ConnectivityServiceTest signature perms use"
  Revert "Use shell permission to query current user"
2021-06-10 23:39:11 +00:00
xingdai
892a0ef152 Revert "Use mockito-extended in FrameworksNetTests"
This reverts commit 98b76cc2ec.

Reason for revert: <INSERT REASONING HERE>

b/190622577

Change-Id: Ief39f82875e6fa885829aea62eed00f2f2e6774e
2021-06-10 21:41:54 +00:00
lifr
e39741db1c Add test for ConnectivityService API isPrivateDnsBroken
Bug: 189161363
Test: atest android.net.cts.ConnectivityManagerTest
      atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Change-Id: Ib45aa439683d48360652a91d7a0609dc82adda33
2021-06-11 05:32:00 +08:00
Treehugger Robot
348d144786 import copy of bpf_net_helpers.h from system/netd/bpf_progs
after this:
  diff system/netd/bpf_progs/bpf_net_helpers.h packages/modules/Connectivity/Tethering/bpf_progs/bpf_net_helpers.h
shows no diff, besides a switch to '#pragma once'
as the include guard.

Test: builds, atest, TreeHugger
Bug: 177884581
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change: https://android-review.googlesource.com/1733033
Merged-In: Ib943321d46254ba64ce206fb9e3b3414d15e4d45
Change-Id: Ib943321d46254ba64ce206fb9e3b3414d15e4d45
2021-06-10 15:24:19 +00:00
Treehugger Robot
1a328dc5b5 Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" am: b9d05685fc am: 80b28dec8c am: 972b65d492
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733172

Change-Id: I24ae86acd0c228066bcdd4c1932ee15a6f176055
2021-06-10 15:22:38 +00:00
Treehugger Robot
972b65d492 Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" am: b9d05685fc am: 80b28dec8c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733172

Change-Id: I3eae11b536613efa377de130a69b58b321a6ae52
2021-06-10 15:10:37 +00:00
TreeHugger Robot
0fef16d827 [automerger skipped] Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa am: 532c1a2b5e -s ours
am skip reason: Merged-In Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079 with SHA-1 3b3d92ced0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14779544

Change-Id: I4f86e8ee9988e5dce41c00b1f4403c22d968269e
2021-06-10 15:10:29 +00:00
markchien
5db3697641 [automerger skipped] Remove *Locked wording am: 8409a1c297 am: dc664bd9e9 -s ours
am skip reason: Merged-In Ia8c057800cab30cdcbacae4db2d706b6427e9861 with SHA-1 8409a1c297 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673213

Change-Id: I4a45c8adcadb8119143a757dc05728668e765aee
2021-06-10 15:10:26 +00:00
Remi NGUYEN VAN
3cd164225b Revert "Remove ConnectivityServiceTest signature perms use"
This reverts commit bba8ec0d43.

Reason for revert: Broken tests b/190622577

Change-Id: I8d15b626fcd8da67094ebf461d381b3922f69024
2021-06-10 15:05:47 +00:00
TreeHugger Robot
4890649105 [automerger skipped] Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa -s ours am: af9d24ce45 -s ours
am skip reason: Merged-In Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079 with SHA-1 21021efbe1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14779544

Change-Id: I2d9d46373f34a9c1a18c35d4fbcbda9fba194587
2021-06-10 15:05:31 +00:00
Remi NGUYEN VAN
499219702b Revert "Use shell permission to query current user"
This reverts commit 95bc8d7067.

Reason for revert: Conflict with revert for b/190622577

Change-Id: I993e8da9737634d0cc815cd75b461699170602cc
2021-06-10 15:05:17 +00:00
TreeHugger Robot
532c1a2b5e Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14779544

Change-Id: I11b73ce42cae4df5314ad58e0a92b4cb834b8ff1
2021-06-10 14:54:34 +00:00
markchien
dc664bd9e9 Remove *Locked wording am: 8409a1c297
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673213

Change-Id: I54fea6433eeffd506378cb5246a0ab42fe4de680
2021-06-10 14:54:32 +00:00
Treehugger Robot
80b28dec8c Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" am: b9d05685fc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733172

Change-Id: I0b7f2048bfc390f53314d3fcdbc7cba41a407361
2021-06-10 14:54:13 +00:00
TreeHugger Robot
af9d24ce45 [automerger skipped] Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa -s ours
am skip reason: Merged-In Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079 with SHA-1 21021efbe1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14779544

Change-Id: I5f5bae54bc6138c9e8997be555c91268ce70b92d
2021-06-10 14:52:50 +00:00
Treehugger Robot
b9d05685fc Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" 2021-06-10 14:35:25 +00:00
TreeHugger Robot
3ea9a136fa Merge changes Ib8fe719f,Ia8c05780 into sc-dev
* changes:
  Suppress IpServer message logs
  Remove *Locked wording
2021-06-10 14:34:08 +00:00
Remi NGUYEN VAN
f892644135 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f am: 79471813b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: I6f9e5bb2a7614ade93c9cbca8a3ac54c3bd3cd15
2021-06-10 14:26:10 +00:00
Remi NGUYEN VAN
c4e3886b64 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f am: a6255e6589
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: Idd70c9b3937c90f1d8c8ee5e160c97c61b5c5934
2021-06-10 14:25:22 +00:00
Remi NGUYEN VAN
a6255e6589 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: I0da9c2e6717256ea88176c836ea5b6ac67919a0a
2021-06-10 14:05:20 +00:00
Remi NGUYEN VAN
79471813b4 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: I3827d12719ddc930a18e8651dd66a2e28b6f92f6
2021-06-10 14:03:59 +00:00
TreeHugger Robot
132ca20505 [automerger skipped] Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e -s ours am: ec4436317b -s ours
am skip reason: Merged-In I00d1aa475033810a5f60f0e3fc692be87ff62e13 with SHA-1 0dd6de5842 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911203

Change-Id: I46c80569f0e0bfaf7c28d1793d98923b68ed8938
2021-06-10 13:48:52 +00:00