Commit graph

42,723 commits

Message SHA1
Merge "Add CTS for setProfileNetworkPreference" am: 5d4f701244 am: 106a4752f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733784

Change-Id: Ib5b529b38eb05c33d2b85ca9a8da3f6a4915125b

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-06-21 10:34:59 +00:00
9bb6c1958d
Merge "Allow mocking permission in TetheringServiceTest" am: ec48bb82aa am: 4abe3f8db3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731231

Change-Id: I634aca925b30b6b15c5b786d7b03db57eadbde36

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-21 10:34:54 +00:00
8c3ef7d73f
Merge "Initialize TetheringManager lazily" am: 7c5902df7e am: b0504221b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736505

Change-Id: Ife4a4416dad23229b7e36340a2836c6fa4e9c66d

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-21 10:34:48 +00:00
071788fa55
Merge "Add CTS for setProfileNetworkPreference" am: 5d4f701244
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733784

Change-Id: I92b3079517424116ef90613a4584b1ad3a74341a

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-06-21 10:34:31 +00:00
106a4752f7
Merge "Add CTS for setProfileNetworkPreference"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-06-21 10:25:05 +00:00
5d4f701244
Merge "Allow mocking permission in TetheringServiceTest" am: ec48bb82aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731231

Change-Id: I8d289032a75b8f05a892a5bf0989f6766e5a4aaf

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-21 10:20:40 +00:00
4abe3f8db3
Merge "Initialize TetheringManager lazily" am: 7c5902df7e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736505

Change-Id: Ic80abe07255d06cdde08d8d302d1d1270f9d0166

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-21 10:20:30 +00:00
b0504221b4
Merge "Allow mocking permission in TetheringServiceTest"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-06-21 10:19:07 +00:00
ec48bb82aa
Merge "CTS test for PacProxyManager" am: b93396edfb am: 7320aefbdd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131

Change-Id: I91bd40cd58c325d0b8d8f016739c07021346024d

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-06-21 10:14:45 +00:00
a7aafd628f
Merge "Initialize TetheringManager lazily"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-06-21 10:03:00 +00:00
7c5902df7e
Merge "CTS test for PacProxyManager" am: b93396edfb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131

Change-Id: I51ec740e13fa0139589b58e3cfb9ef8ee2af5b37

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-06-21 09:59:33 +00:00
7320aefbdd
Merge "CTS test for PacProxyManager"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-06-21 09:42:33 +00:00
b93396edfb
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours am: 5ba981c20a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55e4ae7018f9c5e07b2c7dee6406cbbfa0e9f0ea

Xin Li   authored and   Automerger Merge Worker   commited 2021-06-21 06:39:03 +00:00
46da2f27d6
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours
am skip reason: Merged-In I524644366a398b34de8f659d0d0d275f3f513c0c with SHA-1 d6d3bf0b89 is already in history

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

Change-Id: I2ba01e9d20b85825c557420b2e3a330cfdb41832

Xin Li   authored and   Automerger Merge Worker   commited 2021-06-21 06:10:47 +00:00
5ba981c20a
Initialize TetheringManager lazily
Many applications use ConnectivityManager without needing
TetheringManager (or without calling legacy ConnectivityManager methods
that delegate to TetheringManager), so initializing TetheringManager
when ConnectivityManager is created wastes resources.

This is especially true considering that TetheringManager is not trivial
to initialize (worst case scenario it starts a thread and does multiple
Binder requests), and ConnectivityManager is created in ActivityThread
when setting up the app proxy on startup.

Bug: 190556328
Test: atest FrameworksNetTests CtsNetTestCases TetheringTests
Change-Id: I2ba7b8f2b9e1c934cfb082776b8d643f2f2c17e5

Remi NGUYEN VAN   commited 2021-06-21 10:59:14 +09:00
e4d1cd970e
DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: I524644366a398b34de8f659d0d0d275f3f513c0c
Change-Id: I19bfd3cbd9f65d7936d9cbcbd840c96009f3a575

Xin Li   commited 2021-06-18 12:24:45 -07:00
e7fde0c39a
[automerger skipped] Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev am: 1b64ae6b87 -s ours
am skip reason: Merged-In Ifa103dd66394026d752b407a1bee740c9fcdad2b with SHA-1 53e8a267ab is already in history

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

Change-Id: I7fff4fbf13da9562bd4a2a93798657a84f350a6e

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-06-18 03:01:08 +00:00
1afa01c6fc
[automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 816cc626c8 is already in history

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

Change-Id: Ifb8440a1c5031d840c3a2b7b8eeed84200ad1960

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-06-18 03:00:56 +00:00
42e7e60882
Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev
Lucas Lin   authored and   Android (Google) Code Review   commited 2021-06-18 02:47:24 +00:00
1b64ae6b87
Merge "Add a test to check if the VPN type is set or not" into sc-dev
Lucas Lin   authored and   Android (Google) Code Review   commited 2021-06-18 02:46:50 +00:00
013cf220f0
[automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 -s ours
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 50d8cd23d9 is already in history

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

Change-Id: I205e1535853f9e8eb5771cdba14f975485856475

Frank Li   authored and   Automerger Merge Worker   commited 2021-06-18 01:56:15 +00:00
052e866954
[automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db -s ours
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 e39741db1c is already in history

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

Change-Id: Ia019d6d8c40be6845821b83713b8d6c0001f59b2

Frank Li   authored and   Automerger Merge Worker   commited 2021-06-18 01:56:09 +00:00
1a9c1e359e
[automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 -s ours
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 0fd78de2c6 is already in history

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

Change-Id: Iffde76cc0806347052897b66098556fb90a469a6

Frank Li   authored and   Automerger Merge Worker   commited 2021-06-18 01:56:02 +00:00
278212c225
Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev
Frank Li   authored and   Android (Google) Code Review   commited 2021-06-18 01:37:20 +00:00
799d1c6053
Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev
Frank Li   authored and   Android (Google) Code Review   commited 2021-06-18 01:37:08 +00:00
9097aaf5db
Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev
Frank Li   authored and   Android (Google) Code Review   commited 2021-06-18 01:36:44 +00:00
a9602dc5d3
[automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 fa270db5f7 is already in history

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

Change-Id: I46899b18a14983bcd75e8db0f60073a46924af24

James Mattis   authored and   Automerger Merge Worker   commited 2021-06-17 16:27:25 +00:00
63898d42cb
Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev
James Mattis   authored and   Android (Google) Code Review   commited 2021-06-17 16:08:58 +00:00
24ab50b086
Add CTS test for NetworkRequest.getCapabilities API
Bug: 189162033
Test: atest android.net.cts.NetworkRequestTest
      atest CtsNetTestCasesLatestSdk:NetworkRequestTest
Original-Change: https://android-review.googlesource.com/1717737
Merged-In: I8504caa586bdb567d42047a96029dedc67968793
Change-Id: I8504caa586bdb567d42047a96029dedc67968793

Frank Li   commited 2021-06-17 13:42:34 +00:00
f8e2e20f32
Add test for ConnectivityService API isPrivateDnsBroken
Bug: 189161363
Test: atest android.net.cts.ConnectivityManagerTest
      atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1719395
Merged-In: Ib45aa439683d48360652a91d7a0609dc82adda33
Change-Id: Ib45aa439683d48360652a91d7a0609dc82adda33

Frank Li   commited 2021-06-17 13:22:39 +00:00
3a48843e49
Add CTS test for API setLegacyExtraInfo
Adding in-depth test in NetworkAgentTest
Bug: 187040803
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
      atest CtsNetTestCases:android.net.NetworkAgentConfigTest
Original-Change: https://android-review.googlesource.com/1719131
Merged-In: Ief14f6de0cb6913da944414f0b134eb04346425f
Change-Id: Ief14f6de0cb6913da944414f0b134eb04346425f

Frank Li   commited 2021-06-17 13:00:57 +00:00
b7eebde98a
Add a test to check if the VPN type is set or not
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Original-Change: https://android-review.googlesource.com/1733785
Merged-In: I7ed5989ec767494c1033dc01242b32724e120c4e
Change-Id: I7ed5989ec767494c1033dc01242b32724e120c4e

Lucas Lin   commited 2021-06-17 11:15:17 +00:00
b63f479a02
Send a proxy broadcast when apps moved from/to a VPN
When the apps moved from/to a VPN, a proxy broadcast is needed to
inform the apps that the proxy might be changed since the default
network satisfied by the apps might also changed.
Since the framework does not track the defautlt network of every
apps, thus, this is done when:
  1. VPN connects/disconnects.
  2. List of uids that apply to the VPN has changed.
While 1 is already covered by the current design, the CL implements
2 in order to fulfill the case that different networks have
different proxies.

Bug: 178727215
Test: atest FrameworksNetTests
Original-Change: https://android-review.googlesource.com/1717735
Merged-In: Ifa103dd66394026d752b407a1bee740c9fcdad2b
Change-Id: Ifa103dd66394026d752b407a1bee740c9fcdad2b

Lucas Lin   commited 2021-06-17 11:10:46 +00:00
950a65f8cc
[automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a -s ours
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 63e3dedfee is already in history

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

Change-Id: I21c1884639445291a13be6d0ff96aefc6807a6b7

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-06-17 10:39:11 +00:00
8be0072133
[automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 -s ours
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 eb5451dd35 is already in history

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

Change-Id: I25e1b39535830b6634dd970dce887bc9d3bc3bd8

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-06-17 10:39:09 +00:00
a93f6fb06b
[automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 -s ours
am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 32634e9da3 is already in history

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

Change-Id: I3c76540ebf3e2e7570b34645bbe8283d74be07b5

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-06-17 10:39:07 +00:00
69b3ffde93
[automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours
am skip reason: Merged-In Ia67b963b8e18af8440b1b9bd91f53439848bb838 with SHA-1 561547a537 is already in history

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

Change-Id: I5a334721b8348f8bf095ff1d4a48841d3704bd18

lifr   authored and   Automerger Merge Worker   commited 2021-06-17 10:38:49 +00:00
02a1cffb4d
Fix expectCallback does not fail when no callback received
This hides 3 bugs where,
  1. In Android S, onNetworkRequested is no longer broadcasted
     by ConnectivityService in any condition. However, the test
     still passes since assertion does not fail when no callback
     received. Ignore the test on S+ devices since the behavior
     changed on S or later devices.
  2. Test network agent is not registered, but the test still
     passes.
  3. Test network agent does not fulfill the request that kept
     the network up, so the test fails since the test network
     is not needed and be torn down.

Test: android.net.NetworkProviderTest on R/S device
Bug: 189074532
Merged-In: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
Change-Id: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
  (cherry-picked from aosp/1731450)

Junyu Lai   commited 2021-06-17 09:03:11 +00:00
52e3fa127a
Add CTS for registerBestMatchingNetworkCallback
Bug: 188657173
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest \
      CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
      on R device
Merged-In: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
Change-Id: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
  (cherry-picked from aosp/1727824)

Junyu Lai   commited 2021-06-17 09:02:17 +00:00
512efafd32
No-op refactoring of NetworkAgentTest
This is a no-op refactoring of NetworkAgentTest, which makes
the create*NetworkAgent helper functions easier to use, this
includes:
  1. Rename "name" field to specifier, since it is the only
     purpose of that field.
  2. Make the callback generated with agent dedicated to the
     agent by adding specifier to support multiple agent cases.
  3. Refactor some code flow to for readability and less
     duplicated code.

Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      --rerun-until-failure 100
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest
      on R device
Bug: 188657173
Merged-In: Id7948d218b78ae0abf253ca8925e787362ac463f
Change-Id: Id7948d218b78ae0abf253ca8925e787362ac463f
  (cherry-picked from aosp/1727823)

Junyu Lai   commited 2021-06-17 09:01:09 +00:00
e5bdc06735
Add CTS test for NetworkAgent/NetworkAgentConfig API
The following is a list of APIs:
1. NetworkAgent.setLegacySubtype
2. NetworkAgentConfig.Builder.setLegacySubType
3. NetworkAgentConfig.Builder.setLegacySubTypeName
4. NetworkAgentConfig.Builder.setLegacyExtraInfo

Bug: 190413710
Test: atest android.net.cts.NetworkAgentTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Merged-In: Ia67b963b8e18af8440b1b9bd91f53439848bb838
Change-Id: Ia67b963b8e18af8440b1b9bd91f53439848bb838
  (cherry-picked from aosp/1693668)

lifr   authored and   Junyu Lai   commited 2021-06-17 09:00:30 +00:00
42096be0c6
Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210 am: d6d3bf0b89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: I21303da985c19f1d9682ed215bca3dcaf9fed807

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-06-16 15:39:18 +00:00
c6483aaf30
Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696 am: 98e8422124
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: I5289c072eaf50ef9090549f31537f1fffcf2f160

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-06-16 15:39:11 +00:00
aa3cbdaba6
Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: I524644366a398b34de8f659d0d0d275f3f513c0c

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-06-16 15:29:47 +00:00
d6d3bf0b89
Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: I702a17935b7e0a29d5c45e5ae6bd7ccf3c76eccd

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-06-16 15:29:37 +00:00
98e8422124
Merge "Add test for CM#setAcceptUnvalidated"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-06-16 15:17:51 +00:00
27586f8210
Merge "Add test for CM#setAcceptPartialConnectivity"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-06-16 15:17:37 +00:00
2693dc2696
[automerger skipped] Correctly dump IPv4 downstream flows. am: 175fefc795 -s ours
am skip reason: Merged-In I93a82064c95027c7c63cb30baf8482ecddcbd09d with SHA-1 8569168eda is already in history

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

Change-Id: I4219f058033bb970e8b13878390136342c9f8faf

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-06-16 14:42:21 +00:00
9c1601da77
Merge "Make tests compatible with mockito-extended" am: ad7108ce34 am: c3d789bff1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: I56fcd6452a072d4d6af2f1e81739be5f7f00670a

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-16 13:56:03 +00:00
16bbc032c3
Merge "Make tests compatible with mockito-extended" am: ad7108ce34
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: I3c6de9b5da64e3bb26b1dc75e9184cf373d313fe

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-16 13:34:34 +00:00
c3d789bff1