Commit Graph

44816 Commits

Author SHA1 Message Date
Junyu Lai
092ddbf46a Temporarily disable the test since prebuilt module is not updated am: c42a54f2a7 am: 3ebf903321
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15328937

Change-Id: If65a0bd3a29611df767caa03fc888411172fd2a8
2021-07-21 03:14:55 +00:00
Junyu Lai
d3df3315f1 [automerger skipped] Consider NetworkOffer is unneeded if it cannot satisfy the request am: 135f50679f am: fa9babada5 -s ours
am skip reason: Merged-In Ie3ea59f980c3767782b8e6b03e401c02f664f9bd with SHA-1 dc3a7a39d4 is already in history

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

Change-Id: I1e0bf42f37f932d6ea4d2fc37dbc49bd65b4c43f
2021-07-21 03:14:53 +00:00
Junyu Lai
3ebf903321 Temporarily disable the test since prebuilt module is not updated am: c42a54f2a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15328937

Change-Id: Ic9e6ca1fbbca65e324afa0079e6eaf2ed78fb147
2021-07-21 03:06:13 +00:00
Junyu Lai
fa9babada5 Consider NetworkOffer is unneeded if it cannot satisfy the request am: 135f50679f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730722

Change-Id: Ie6e029f4cb7a2e80120d216973ea2718dfb66661
2021-07-21 03:06:11 +00:00
Treehugger Robot
3e8446779c Merge changes I6e6b40b0,I6a0d93e0,Ie26f6e52 am: 1004c23b35 am: ef7274ca97 am: 0305762d6c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772430

Change-Id: If940c5b0f4f99586032417c4901af7824432784e
2021-07-20 15:20:25 +00:00
Remi NGUYEN VAN
175426102d Merge "Bump Tethering apex version code for S" am: 8b3213f38e am: 8ea56369dc am: d1a4e1b4c4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768350

Change-Id: I7da57453efa38b0369eb127a376f31d750e06f6b
2021-07-20 15:20:19 +00:00
Remi NGUYEN VAN
ec7bac3f7b [automerger skipped] Bump Tethering apex version code for R am: 4d535a4e51 -s ours am: 8dbbe19d37 -s ours
am skip reason: Merged-In Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is already in history

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

Change-Id: If06ed669515c5351a853ed6273645d8a42692a9f
2021-07-20 15:20:13 +00:00
Treehugger Robot
0305762d6c Merge changes I6e6b40b0,I6a0d93e0,Ie26f6e52 am: 1004c23b35 am: ef7274ca97
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772430

Change-Id: Ib1c4033e9416f3295529b75ae3e6de8e0e105425
2021-07-20 15:08:39 +00:00
Remi NGUYEN VAN
d1a4e1b4c4 Merge "Bump Tethering apex version code for S" am: 8b3213f38e am: 8ea56369dc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768350

Change-Id: I702d805bd124b592ff1c44362872837b530a3fc9
2021-07-20 15:08:33 +00:00
Remi NGUYEN VAN
8dbbe19d37 [automerger skipped] Bump Tethering apex version code for R am: 4d535a4e51 -s ours
am skip reason: Merged-In Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is already in history

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

Change-Id: Id8222cd6629a3ca36c678dbd9d5f38c889311c6b
2021-07-20 15:08:27 +00:00
Treehugger Robot
ef7274ca97 Merge changes I6e6b40b0,I6a0d93e0,Ie26f6e52 am: 1004c23b35
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772430

Change-Id: I5283354f545ef3f9b01f9327e2558314aab1f8f0
2021-07-20 14:56:44 +00:00
Remi NGUYEN VAN
8ea56369dc Merge "Bump Tethering apex version code for S" am: 8b3213f38e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768350

Change-Id: I04242193776c2a35a6bfc91a4c966a52a30aaceb
2021-07-20 14:56:34 +00:00
Remi NGUYEN VAN
4d535a4e51 Bump Tethering apex version code for R
The version code in the manifest is only used for development
builds, as release builds dynamically replace it.

Tethering should have been using 309999900 during S development. That
version was used in many downstream branches, so make it consistent so
it can be bumped for S in all branches.

Bug: 193853555
Change-Id: Ia0e4edaa4fce24e9600fa1d47445b5109d8ee51e
Test: m com.google.android.tethering, check version code
Merged-In: Ia3d5f2201ce67308df8e2689f6c99e28049a4877
Merged-In: I0d4bd06e79adedbf582d2fed551d9f1bde521fd1
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
2021-07-20 13:18:12 +00:00
Treehugger Robot
1004c23b35 Merge changes I6e6b40b0,I6a0d93e0,Ie26f6e52
* changes:
  Revert "[CTT-5] Stop update TCP conntrack entry timeout"
  Revert "[CTT-6] Update TCP conntrack entry timeout while adding rules"
  Revert "[CTT-7] Delete the rules while half-closing tcp state entered"
2021-07-20 10:49:18 +00:00
Remi NGUYEN VAN
ef3d0cee12 [automerger skipped] Merge "Bump Tethering apex version code for R" am: 5bd49caf78 -s ours am: 35448220a6 -s ours am: 88ce5927f8 -s ours
am skip reason: Merged-In Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is already in history

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

Change-Id: Ifd9c00be7d8575c9dee05462542460e80330732d
2021-07-20 09:43:44 +00:00
Remi NGUYEN VAN
88ce5927f8 [automerger skipped] Merge "Bump Tethering apex version code for R" am: 5bd49caf78 -s ours am: 35448220a6 -s ours
am skip reason: Merged-In Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is already in history

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

Change-Id: If2aae37b3e20ab114b880d1a3f256f29bf9fe04f
2021-07-20 09:26:01 +00:00
Remi NGUYEN VAN
35448220a6 [automerger skipped] Merge "Bump Tethering apex version code for R" am: 5bd49caf78 -s ours
am skip reason: Merged-In Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is already in history

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

Change-Id: Ic87443891c06402e68c6999af7c606f271f63107
2021-07-20 09:12:50 +00:00
Remi NGUYEN VAN
8b3213f38e Merge "Bump Tethering apex version code for S" 2021-07-20 09:00:45 +00:00
Remi NGUYEN VAN
5bd49caf78 Merge "Bump Tethering apex version code for R" 2021-07-20 09:00:37 +00:00
Treehugger Robot
64b69a4892 Merge "Correct log" am: 913dba8be3 am: 3f6e40dbd7 am: 855d6cdf05
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772285

Change-Id: Ib2fb4e992367ce97c46233c2524d275a7aeff194
2021-07-20 08:58:33 +00:00
Nucca Chen
199e86dcb3 Revert "[CTT-5] Stop update TCP conntrack entry timeout"
This reverts commit a5c742be69.

Reason for revert:
Stop releasing this commit because it needs more test coverage.

Bug: 190783768
Bug: 192804833
Change-Id: I6e6b40b0f6207ed197d01bfabb616f1afa31fb70
Test: atest TetheringCoverageTests
2021-07-20 08:52:38 +00:00
Nucca Chen
254ba6b235 Revert "[CTT-6] Update TCP conntrack entry timeout while adding rules"
This reverts commit 299a81157c.

Reason for revert:
Stop releasing this commit because it needs more test coverage.

Bug: 190783768
Bug: 192804833
Change-Id: I6a0d93e04814ae73e1ec7d6fd4df19e1d2787207
Test: atest TetheringCoverageTests
2021-07-20 08:50:49 +00:00
Nucca Chen
7abf514272 Revert "[CTT-7] Delete the rules while half-closing tcp state entered"
This reverts commit 118b5b578a.

Reason for revert: 
Stop releasing this commit because it needs more test coverage.

Bug: 190783768
Bug: 192804833
Change-Id: Ie26f6e528999da42cfa66a5f6c1f187ad2276ae1
Test: atest TetheringCoverageTests
2021-07-20 08:47:13 +00:00
Treehugger Robot
855d6cdf05 Merge "Correct log" am: 913dba8be3 am: 3f6e40dbd7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772285

Change-Id: I295f07a5621e20ad4cf1bfeafd8a4f57f00d96dd
2021-07-20 08:45:41 +00:00
Treehugger Robot
3f6e40dbd7 Merge "Correct log" am: 913dba8be3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772285

Change-Id: Iaa5c67c3c56ee39fee590ff8c2bed5e8731ea38d
2021-07-20 08:32:38 +00:00
Treehugger Robot
913dba8be3 Merge "Correct log" 2021-07-20 08:20:37 +00:00
Junyu Lai
c42a54f2a7 Temporarily disable the test since prebuilt module is not updated
This CL is subject to be reverted in a few days when the prebuilt
Connectivity module is updated.

Ignore-AOSP-First: This is for sc-dev and its downstreams only
Test: android.net.NetworkProviderTest
Bug: 189074532
Change-Id: I512552400960668c0ba91a8d997d1e2747209538
2021-07-20 05:58:08 +00:00
Junyu Lai
135f50679f Consider NetworkOffer is unneeded if it cannot satisfy the request
Currently, to prevent from network connect-teardown-loops that
caused by inaccurate reports, e.g. the provider always provides
a better network than the offer, the NetworkOffer is considered
needed if its provider is currently serving the request. This
is because there is no accurate way to know whether the offer is
corresponding to the network that is currently serving the
request.

However, if the offer cannot even satisfies the request, consider
the offer is needed does not make any sense. Since it can
never be the one that currently serving the request, nor be
the one that might beat current satisfier.

Test: android.net.NetworkProviderTest
Bug: 189074532
Original-Change: https://android-review.googlesource.com/1731452
Merged-In: Ie3ea59f980c3767782b8e6b03e401c02f664f9bd
Change-Id: Ie3ea59f980c3767782b8e6b03e401c02f664f9bd
2021-07-20 05:43:44 +00:00
Chiachang Wang
525b07d28a Correct log
Log should print the taken parameter instead of the value of
current variable

Test: m
Bug: 192149168
Change-Id: Ia3b9e607fe8b661a7faea3b46b9697fa85016440
2021-07-20 13:16:57 +08:00
Chiachang Wang
02c385adca Merge "Specify which callback is unexpected in tests" am: 5251171b75 am: 12a042be77 am: 795d0c3574
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769289

Change-Id: I106b65532268b78a378b7d280578426c79c21110
2021-07-20 01:58:45 +00:00
Chiachang Wang
f01fb10e41 Merge "Deflake test to ensure system default network as expected" am: 575fa2f103 am: 250cf2af8a am: c79dce9599
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764308

Change-Id: I62c4b92e83c5f87e7f53ab2db0c88e9aed3ab859
2021-07-20 01:58:29 +00:00
Chiachang Wang
795d0c3574 Merge "Specify which callback is unexpected in tests" am: 5251171b75 am: 12a042be77
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769289

Change-Id: I48948a8f04a2053cd24f153e1322df00fcedbf64
2021-07-20 01:49:11 +00:00
Chiachang Wang
c79dce9599 Merge "Deflake test to ensure system default network as expected" am: 575fa2f103 am: 250cf2af8a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764308

Change-Id: I34d1a75250faed18b734c68d9a0326ac46c645b4
2021-07-20 01:49:05 +00:00
Chiachang Wang
12a042be77 Merge "Specify which callback is unexpected in tests" am: 5251171b75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769289

Change-Id: I05d42c13e430d9f76fe75e2e73ce4e41cb662820
2021-07-20 01:36:27 +00:00
Chiachang Wang
250cf2af8a Merge "Deflake test to ensure system default network as expected" am: 575fa2f103
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764308

Change-Id: I7deef58610d456bdcf0f1c1a93b861bf45653164
2021-07-20 01:36:22 +00:00
Chiachang Wang
5251171b75 Merge "Specify which callback is unexpected in tests" 2021-07-20 01:20:16 +00:00
Chiachang Wang
575fa2f103 Merge "Deflake test to ensure system default network as expected" 2021-07-20 01:20:07 +00:00
Treehugger Robot
f247a76a54 Merge "Temporarily change uid to appId" am: 1e4d4001f4 am: 28a6b24430 am: dd1bb19405
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1770606

Change-Id: I463bbd643a0ad423ba6524029d51749810021fbe
2021-07-19 14:30:46 +00:00
Treehugger Robot
dd1bb19405 Merge "Temporarily change uid to appId" am: 1e4d4001f4 am: 28a6b24430
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1770606

Change-Id: I21f33adcb478800139621a6730ab4740647711a9
2021-07-19 14:17:27 +00:00
Treehugger Robot
28a6b24430 Merge "Temporarily change uid to appId" am: 1e4d4001f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1770606

Change-Id: I2fb613b4f846605e4643c5b21dd7d5cfac2a3cc3
2021-07-19 14:03:12 +00:00
Treehugger Robot
1e4d4001f4 Merge "Temporarily change uid to appId" 2021-07-19 13:47:18 +00:00
Treehugger Robot
db8421e29d Merge "Fix a flake with mocking." am: 527f040944 am: ec050a37ab am: 19eaa44e9f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1762391

Change-Id: I5b1fc23ad5dc36af7cdc39d07ada95fd099412bc
2021-07-19 13:03:09 +00:00
Treehugger Robot
19eaa44e9f Merge "Fix a flake with mocking." am: 527f040944 am: ec050a37ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1762391

Change-Id: Ie146448d14695a88688a37e5993504d527de9404
2021-07-19 12:51:20 +00:00
Treehugger Robot
ec050a37ab Merge "Fix a flake with mocking." am: 527f040944
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1762391

Change-Id: Ie8f389c1df00c68514dad1ac620b32ed34c2e22a
2021-07-19 12:36:34 +00:00
Remi NGUYEN VAN
cbc5007b9e [automerger skipped] Merge changes from topic "sdk_int_cp" am: 800eff01d0 am: ab157b3c5b -s ours am: 8372f90643 -s ours
am skip reason: Merged-In I1fbc0f714d539a664c053cb9cf1f86c3e651c5a2 with SHA-1 5798a37596 is already in history

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

Change-Id: I97f7f6de46e25fb3e3314604a967daf68f61a14c
2021-07-19 12:26:11 +00:00
paulhu
f16cd9c0df [automerger skipped] Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity am: bee1c6d9cd am: a73afb9790 -s ours am: 23f47f35dc -s ours
am skip reason: Merged-In I2f155592b08cdbf259a00b035cacb37ca9847e72 with SHA-1 e0f3796bbb is already in history

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

Change-Id: I9187d193aaaa79ea955a2c8a607fadda1a113793
2021-07-19 12:26:09 +00:00
Remi NGUYEN VAN
e5772017be Merge "Wait for next network in waitForAvailable" am: e9f65535e0 am: f38d076a83 am: 0e526cd506
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760698

Change-Id: Ib0cb160c285495e0c8f4ad85fca2d29785d0cc02
2021-07-19 12:24:20 +00:00
Treehugger Robot
527f040944 Merge "Fix a flake with mocking." 2021-07-19 12:16:18 +00:00
paulhu
0433dd20b7 Temporarily change uid to appId
Due to b/192431153, PermissionMonitor only apply permission to
app id which is listed in settings. Thus, temporarily change uid
to appId.

Bug: 192116643
Test: atest ConnectivityManagerTest#testUidsAllowedOnRestricted\
      Networks with system & secondary user.
Change-Id: Iadec66344d88bd80170cd5441270b768cdbe0917
2021-07-19 18:51:03 +08:00
Chiachang Wang
6c80c3806d Specify which callback is unexpected in tests
Tests may be flaky due to the usage for assertNoCallback().
The method expects no any callback received. Based on the usage,
tests expect to not to receive certain callback, such as
onAvailable(). The network may update its linkproperties during
the test and trigger onLinkPropertiesChanged(). These callbacks
are ignorable in the tests. They should not fail the tests.

Replace the assertNoCallback to new assertNoCallbackThat with
callback type specified to deflake tests.

Bug: 192239030
Test: atest android.net.cts.ConnectivityManagerTest\
      --iterations 20
Change-Id: I1643c1ff15215c07e174dbcb664cfac2a38d5840
2021-07-19 18:41:53 +08:00