Commit Graph

10985 Commits

Author SHA1 Message Date
Yan Yan
efe302556e Update VPN tests to mock out createAttributionContext
This allows VpnManagerServiceTest continues to work after
adding an attribution tag to VpnManagerService

Ignore-AOSP-First: This project will automerge from AOSP to
                   udc-mainline-prod but the dependency CL in
                   frameworks/base/ will not. Thus changes will be
                   merged to udc-dev first and then cherry picked
                   to AOSP
Bug: 278943609
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.VpnManagerServiceTest
Change-Id: I4228a7fb308b8d01aee53f0734f4c5753908473a
2023-06-09 21:01:00 +00:00
Treehugger Robot
90c2d0e361 Merge "Use assertFailsWith to verify exception cases" am: f9e014317e am: 03726fb657 am: 458e54a1fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618635

Change-Id: Ib0178c3a1ca9e6a79f9e24ed4a71d517add3ab11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 12:53:23 +00:00
Treehugger Robot
32e8c51a3f Merge "Use assertFailsWith to verify exception cases" am: f9e014317e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618635

Change-Id: Id3eac9f596d361ccf9b20609e2fa1ef8af02dbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 10:39:03 +00:00
Treehugger Robot
f9e014317e Merge "Use assertFailsWith to verify exception cases" 2023-06-09 10:29:39 +00:00
Remi NGUYEN VAN
177dade553 Merge changes I178ed839,Iff78d02a into udc-dev
* changes:
  Fix cache flush always causing response change
  Adjust the notifyNetworkUnrequested on handleRegisterListener
2023-06-09 09:34:58 +00:00
Remi NGUYEN VAN
9e920c73fa Merge changes from topic "cherrypicker-L42900000961040401:N31900001374826989" into udc-dev
* changes:
  Update record receipt time on records updated
  Renew the SRV/TXT records if half of TTL passed
  Turn on removeExpiredService feature
  Import the MdnsConstants and MdnsRecord
2023-06-09 09:34:36 +00:00
Motomu Utsumi
2738f4fd4d Add test for default network activity APIs
Following CLs update LegacyNetworkActivityTracker to support multiple
network activities including non default network.
To avoid breaking default network activity APIs, this CL adds tests.
Following CL fix known issues of LegacyNetworkActivityTracker so this
CL also adds test for known issue behavior.

Bug: 279380356
Test: FrameworksNetTests
Change-Id: Ic180efe690807e940d0b412a38ebc5e6d22691c4
2023-06-09 17:28:44 +09:00
Hansen Kurli
54933b9b42 Merge "Ensure public methods are running on handler thread" am: 7e343d58ce am: 87d5d84cf0 am: 1ff3ffdf62
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2584553

Change-Id: I196e7940e944b94c267bb0964a2639d8a32d3c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 06:54:11 +00:00
chiachangwang
60179ec28e Use assertFailsWith to verify exception cases
Test: atest FrameworksNetTests
Change-Id: If7373a1e6543975bee9c646384f6ca4d643a1711
2023-06-09 06:08:39 +00:00
Hansen Kurli
e81fb50be8 Merge "Ensure public methods are running on handler thread" am: 7e343d58ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2584553

Change-Id: I582e1296077fea5aa7169d977e522b4e7c9d4517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 05:25:14 +00:00
Hansen Kurli
7e343d58ce Merge "Ensure public methods are running on handler thread" 2023-06-09 04:54:58 +00:00
Chiachang Wang
e86d0b91ab Merge "Stop TCP keepalive from CS for fd initiated stop events" am: 646715e787 am: 9243af84e8 am: dfc1d78c63
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2604526

Change-Id: I59532836344bf631b05a6b584308e5730ef8cff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 03:30:57 +00:00
TreeHugger Robot
ac08b0a8c7 Merge "Remove unnecessary cts tag." into udc-dev am: f17321b8dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23578869

Change-Id: I75bf9506c2e1eaed191bb310e623326e194b8213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 03:09:17 +00:00
TreeHugger Robot
5938fc87aa Merge "Remove unnecessary cts tag." into udc-dev am: f17321b8dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23578869

Change-Id: I39ade947873fe8c8f32ba52044fe53431ba3e0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 03:04:46 +00:00
TreeHugger Robot
f17321b8dd Merge "Remove unnecessary cts tag." into udc-dev 2023-06-09 02:56:40 +00:00
Chiachang Wang
9e36faf731 Merge "Stop TCP keepalive from CS for fd initiated stop events" am: 646715e787
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2604526

Change-Id: I4b786cbe322f8ffcb1fc046a316f7f9143180ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 01:57:28 +00:00
Chiachang Wang
646715e787 Merge "Stop TCP keepalive from CS for fd initiated stop events" 2023-06-09 01:05:46 +00:00
chiachangwang
739f0960f3 Stop TCP keepalive from CS for fd initiated stop events
When a TCP keepalive start request is sent from ConnectivityService
to KeepaliveTracker, the keepalive is tracked on both
AutomaticOnOffKeepaliveTracker and KeepaliveTracker. The existing
design stops the keepalive inside KeepaliveTracker without
notifying AutomaticOnOffKeepaliveTracker for fd initiated stops.
This causes AutomaticOnOffKeepaliveTracker to lose track of these
fd initiated stops and cause a leak on the object.

The updated design sends the event to ConnectivityService handler
to handle the event down from ConnectivityService. This ensures
that each stakeholder class will get the stop event.

Bug: 283885097
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Change-Id: I3c40d80694cd2c046f3a19ddb8f437878c98ab43
2023-06-08 15:31:42 +00:00
Yuyang Huang
acda074318 Merge "Enable useSessionIdToScheduleMdnsTask" am: 01b988255f am: 914651bd33 am: a4ea0d5a08
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2619296

Change-Id: Ib9820eb0d2e79cd8d8708535c82f7c338e551a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 12:44:22 +00:00
Yuyang Huang
7db258d02f Merge "Enable useSessionIdToScheduleMdnsTask" am: 01b988255f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2619296

Change-Id: I71ead9ae123744c6d31028d5c2421421a4d8861b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 11:19:58 +00:00
Yuyang Huang
40f7301143 Merge "Fix cache flush always causing response change" am: e0f07a9dc1 am: 2c6d0a48f8 am: ec74fd57c9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2619297

Change-Id: Ib1a58abe76609a7b16fc5473165c0266fc4cb79f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 11:19:22 +00:00
Yuyang Huang
01b988255f Merge "Enable useSessionIdToScheduleMdnsTask" 2023-06-08 10:41:58 +00:00
Yuyang Huang
e4cbda29ef Fix cache flush always causing response change
When the cache flush bit is set on host address records in a response,
known records are cleared and replaced with the contents of the packet.
However even if the response contains the same records as before, this
caused it to be marked as modified, and response modified callbacks are
sent for every incoming packet.

Instead, ensure that the response is only marked as modified if a
previously unknown address record is added, or if a previously known
address record is removed.

The issue wasn't found by the existing testDecodeWithNoChange test,
because it used a service record for testhost2 instead of testhost1, so
the address records were ignored.

Original change: https://r.android.com/2619297

Bug: 285997766
Bug: 285084489
Test: atest CtsNetTest FrameworksNetTests

Change-Id: I178ed8398afe4354c09bdb3fa5c221377385417e
Merged-In: Ic0f19adf5d9bde7cdab766e49cf677b319a2219b
2023-06-08 09:58:23 +00:00
Yuyang Huang
7032ddb87c Merge "Fix cache flush always causing response change" am: e0f07a9dc1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2619297

Change-Id: I5d259e1ba1d3c066d1081a6ff173cb467a8c946e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 09:57:16 +00:00
Yuyang Huang
e0f07a9dc1 Merge "Fix cache flush always causing response change" 2023-06-08 09:17:59 +00:00
Paul Hu
bf8835ae0a Merge "Adjust the notifyNetworkUnrequested on handleRegisterListener" am: bad235f4f9 am: 5d7547e05d am: fce03e4e8e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618620

Change-Id: I4ef47b845a5fa71c7736a32f90e15ab2938d8a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 08:53:51 +00:00
Yuyang Huang
c505844d8a Enable useSessionIdToScheduleMdnsTask
In case that the task is not canceled successfully, use session ID to
check if this task should continue to schedule more.

Bug: 285260665
Test: atest CtsNetTest FrameworksNetTests
Change-Id: Ic953ae781449a7ebf943999c8c8d3040a97641d9
2023-06-08 17:38:52 +09:00
Paul Hu
1d4ea9ac41 Adjust the notifyNetworkUnrequested on handleRegisterListener
If the MdnsServiceTypeClient was removed when the
SocketCreationCallback#onAllSocketsDestroyed() was called, the
MdnsSocketClientBase#notifyNetworkUnrequested() will not be
called when a listener is unregistered from the
MdnsDiscoveryManager. This is because the serviceTypeClients will
be cleared after the socket is destroyed. However, these dead
listeners will be re-added to the MdnsServiceTypeClient when a
new socket is created. They will then continue to send callbacks
to the NsdService. Therefore, the notifyNetworkUnrequested()
should be moved to the beginning of the handleRegisterListener()
to ensure that the socket unregistration is properly notified.

Original change: https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2618620

Bug: 285997766
Change-Id: Iff78d02ad685f187e6906d29851bc857c61a0a53
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Merged-In: I31c766305018889f50a7c12c836174c340d01d7f
2023-06-08 07:44:30 +00:00
Remi NGUYEN VAN
98a44bcb29 Fix cache flush always causing response change
When the cache flush bit is set on host address records in a response,
known records are cleared and replaced with the contents of the packet.
However even if the response contains the same records as before, this
caused it to be marked as modified, and response modified callbacks are
sent for every incoming packet.

Instead, ensure that the response is only marked as modified if a
previously unknown address record is added, or if a previously known
address record is removed.

The issue wasn't found by the existing testDecodeWithNoChange test,
because it used a service record for testhost2 instead of testhost1, so
the address records were ignored.

Bug: 285997766
Bug: 285084489
Test: atest CtsNetTest FrameworksNetTests

Change-Id: Ic0f19adf5d9bde7cdab766e49cf677b319a2219b
2023-06-08 16:30:31 +09:00
Paul Hu
54ef1040e5 Merge "Adjust the notifyNetworkUnrequested on handleRegisterListener" am: bad235f4f9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618620

Change-Id: I6f7b4cbf17bbc1bc8f5e2dcc79f3985d0f5764af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 07:22:27 +00:00
Paul Hu
bad235f4f9 Merge "Adjust the notifyNetworkUnrequested on handleRegisterListener" 2023-06-08 06:34:25 +00:00
Aaron Huang
25ef171b68 Fix a bug where the PAC proxy port is not set correctly.
Test: new test for this behavior in the preliminary change
Test: FrameworksNetTests NetworkStackTests
Fixes: 138810051
Fixes: 140610528
(cherry picked from https://android-review.googlesource.com/q/commit:9fe47bee099125cf01fa153cdef28e100b9f3a0c)
Merged-In: I95a979d232fb60ece2e33e972bf5d66d20357a1f
Change-Id: I95a979d232fb60ece2e33e972bf5d66d20357a1f
Bug: 263074841
2023-06-08 03:58:12 +00:00
Aaron Huang
58f949afcf Add tests for PAC proxies.
Test: this is a change that adds a test
Bug: 138810051
Bug: 140610528
(cherry picked from https://android-review.googlesource.com/q/commit:40b524448cee6bb54db8c77a3fc266ca2a4dea28)
Merged-In: I6e7b77320f6baf32ac2f98634fa2e3231d1bf12f
Change-Id: I6e7b77320f6baf32ac2f98634fa2e3231d1bf12f
Bug: 263074841
2023-06-08 03:58:08 +00:00
Paul Hu
c54aa729c9 Adjust the notifyNetworkUnrequested on handleRegisterListener
If the MdnsServiceTypeClient was removed when the
SocketCreationCallback#onAllSocketsDestroyed() was called, the
MdnsSocketClientBase#notifyNetworkUnrequested() will not be
called when a listener is unregistered from the
MdnsDiscoveryManager. This is because the serviceTypeClients will
be cleared after the socket is destroyed. However, these dead
listeners will be re-added to the MdnsServiceTypeClient when a
new socket is created. They will then continue to send callbacks
to the NsdService. Therefore, the notifyNetworkUnrequested()
should be moved to the beginning of the handleRegisterListener()
to ensure that the socket unregistration is properly notified.

Bug: 285997766
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Change-Id: I31c766305018889f50a7c12c836174c340d01d7f
2023-06-08 10:29:07 +08:00
Chiachang Wang
2bc0ddea4d Merge "Correct the order of import and remove unused definition" am: e6f9de64af am: 97cfd8dede am: a63aba4e33
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618615

Change-Id: I5a98609edbde5b8d80fbff6a94914fdf8c1765e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 11:01:04 +00:00
Chiachang Wang
dd2dffb695 Merge "Correct the order of import and remove unused definition" am: e6f9de64af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618615

Change-Id: I48a6c626d15bec0f3df8cc6c67aa385883844935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:33:56 +00:00
Chiachang Wang
e6f9de64af Merge "Correct the order of import and remove unused definition" 2023-06-07 09:18:10 +00:00
Yihan Dong
dc3a783a7a Remove unnecessary cts tag.
Some modules defined in the build file are only data dependencies of cts test modules. In this case, they will be packaged to corresponding test modules. For example, if module A is a data dependency of test module B, the module A can be found under android-cts/testcases/B/ directory. Therefore it is unnecesasry to tag data dependencies which will cause a duplicate folder, e.g. android-cts/testcases/A.

Change-Id: I1b0f08c245dc51419ed12283c40df2e6ee71ebce
Test: m cts
Bug: 283199104
Ignore-AOSP-First: The clean-up is for package size improvement on U. The backfill will apply to aosp later.
2023-06-07 08:46:22 +00:00
Junyu Lai
7b170eb0b8 Merge "Add more log when Range misconfigured" am: 1edaaf291a am: 466ae2f31f am: 44241c80d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618589

Change-Id: Ic171f0900e1a675f3c2dd15a3bdc0d0cfd714263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 08:08:49 +00:00
chiachangwang
8af048721a Correct the order of import and remove unused definition
Test: atest
Change-Id: I60c409db5436a5ba9fffdee9df24158f15751658
2023-06-07 06:46:29 +00:00
Junyu Lai
8c870a56cc Merge "Add more log when Range misconfigured" am: 1edaaf291a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618589

Change-Id: I963b8cd0708ecedfbd567ec5784d5dd6b945beea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 06:22:28 +00:00
Junyu Lai
1edaaf291a Merge "Add more log when Range misconfigured" 2023-06-07 05:28:30 +00:00
Junyu Lai
e4a6153d08 Add more log when Range misconfigured
Currently, when lower/upper bound of Range is incorrect,
there is no useful information for debugging.

Test: atest TrafficStatsTest
Bug: 285452306
Change-Id: I0e390692c20b37e14958ecc0fd45c93f73fe63e2
2023-06-07 10:41:08 +08:00
Jean Chalard
78efbdcad1 Merge "Fix a bug where the PAC proxy port is not set correctly." am: f2b38772ac am: 19fec43662 am: 9a0b1f2653
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729153

Change-Id: I1612e3a0360961267264c80ecff16ec49e75f33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:23:47 +00:00
Jean Chalard
373be74480 Merge "Fix a bug where the PAC proxy port is not set correctly." am: f2b38772ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729153

Change-Id: Icc9da3c5a95db0712bfbedf884e1e949cdc56ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 12:59:05 +00:00
Jean Chalard
f2b38772ac Merge "Fix a bug where the PAC proxy port is not set correctly." 2023-06-06 12:22:21 +00:00
Treehugger Robot
a6fe186c0b Merge "Update record receipt time on records updated" am: 1667bfea04 am: 1b63464039 am: 6a4e16114f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2614892

Change-Id: I406fbf4b5e8853403c514586f94c5dcad666fa28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 10:10:57 +00:00
Remi NGUYEN VAN
b38b4de6bf Merge "Take the multicast lock on mDNS usage" am: 5f921c4292 am: ad48b5bb9f am: e868d2eacc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606585

Change-Id: I70bc579c93b9143c2bbbd3a4cfd44a1c9423393a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 10:10:36 +00:00
Treehugger Robot
188578dfd8 Update record receipt time on records updated
The receipt time in the MdnsResponse need to be updated every time new
packet is received. And then the record refreshing logic could calculate
remaining TTL correctly.

Original change: https://r.android.com/2614892

Change-Id: I4fea296496c2bd3e988601079513365b35a52ad8
Fixes: 285260665
Test: atest CtsNetTest FrameworksNetTests
Merged-In: Ib7a290ea0ea8e552c71c657696397e8114fcee52
2023-06-06 10:08:20 +00:00
Treehugger Robot
30218cb80c Merge "Update record receipt time on records updated" am: 1667bfea04
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2614892

Change-Id: I9efac571b1dd086912942f9af2c2b476e6914cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 08:46:16 +00:00