LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,715 Commits 2 Branches 0 Tags
d1a4e1b4c4dd41efbe5e78d9ba98e7de4d4ce3cb
Commit Graph

42715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Chiachang Wang
ac059de6ad Deflake test to ensure system default network as expected 
CtsNetUtils.toggleWifi() expects to receive a CONNECTIVITY_ACTION
broadcast after disconnecting from wifi if wifi is enabled.
The wifi may be connected but not validated since wifi just
turns back to connected from the previous test. In this case,
the system default netwok will not be wifi, so there is no
CONNECTIVITY_ACTION broadcast after disconnecting wifi. It
should ensure the wifi is system default network first before
proceeding with other verifications.

Bug: 192213759
Test: atest CtsNetTestCases --iterations 20
Change-Id: I82f0634883362e35b88854aae28e61b75a3cd7cc
 2021-07-19 18:38:31 +08:00
Remi NGUYEN VAN
8372f90643 [automerger skipped] Merge changes from topic "sdk_int_cp" am: 800eff01d0 am: ab157b3c5b -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: I64982175a6aa08616ca885f3a9dfddcc6bc91110
 2021-07-19 10:25:50 +00:00
paulhu
23f47f35dc [automerger skipped] Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity am: bee1c6d9cd am: a73afb9790 -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: I3e9ab49e543dc0970671b12139906d7469710acd
 2021-07-19 10:25:48 +00:00
Remi NGUYEN VAN
0e526cd506 Merge "Wait for next network in waitForAvailable" am: e9f65535e0 am: f38d076a83 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760698

Change-Id: Iafeca4e8049214af7871da406c2e2ddfe1c18df8
 2021-07-19 10:25:11 +00:00
Remi NGUYEN VAN
ab157b3c5b Merge changes from topic "sdk_int_cp" am: 800eff01d0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686027

Change-Id: I683d14bcaac2c85e2551b729d2d97d036cdc824f
 2021-07-19 10:08:42 +00:00
paulhu
a73afb9790 Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity am: bee1c6d9cd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686026

Change-Id: I6dd95839749f877a272070387130aada5a157062
 2021-07-19 10:08:41 +00:00
Remi NGUYEN VAN
f38d076a83 Merge "Wait for next network in waitForAvailable" am: e9f65535e0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760698

Change-Id: I3390ce0ad504e7367840ef13b9311e889a9798b1
 2021-07-19 10:06:02 +00:00
Remi NGUYEN VAN
800eff01d0 Merge changes from topic "sdk_int_cp" 
* changes:
  Fix testSocketKeepaliveLimitTelephony on R
  Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity
 2021-07-19 09:47:21 +00:00
Remi NGUYEN VAN
e9f65535e0 Merge "Wait for next network in waitForAvailable" 2021-07-19 09:47:12 +00:00
Remi NGUYEN VAN
354f5cf7d0 Merge "Skip BatteryStatsManagerTest on Q" am: e2067816e9 am: 4bcefe111a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764310

Change-Id: I4168b127b63517c80aebbf270ecd0ec0b2f122cb
 2021-07-19 09:39:21 +00:00
Remi NGUYEN VAN
4bcefe111a Merge "Skip BatteryStatsManagerTest on Q" am: e2067816e9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764310

Change-Id: Iac778fc5dfe0b5ec0adf400372b3e43c5cc76d5d
 2021-07-19 09:25:12 +00:00
Remi NGUYEN VAN
e2067816e9 Merge "Skip BatteryStatsManagerTest on Q" 2021-07-19 09:11:54 +00:00
Remi NGUYEN VAN
1d6e7d5117 Bump Tethering apex version code for S 
The version code in the manifest is only used for development
builds, as release builds dynamically replace it.

319999900 is appropriate as it indicates that the module is compatible
with S and earlier, and allows installing development versions on any
S build, which use 31xxxxxxx versions. It will also still allow installing
production T modules (32xxxxxxx) on a development S build. This is
convenient for local testing.

The same convention is also used for other modules including
NetworkStack.

Bug: 193853555
Test: m com.google.android.tethering, check version code

Change-Id: Ib8905a641780bed490a38327facee4a76e7770a3
 2021-07-19 18:09:20 +09:00
Remi NGUYEN VAN
13b8b17b11 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
Test: m com.google.android.tethering, check version code
Merged-In: Ia3d5f2201ce67308df8e2689f6c99e28049a4877
Merged-In: I0d4bd06e79adedbf582d2fed551d9f1bde521fd1
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I644f0d801efb491be45c3dc29fa1058476282772
 2021-07-19 18:07:23 +09:00
Treehugger Robot
fa45b598d5 Merge "No-op cleanup" am: 21592b0d93 am: 866b9c4480 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769285

Change-Id: Ib19a5d93e0b4e2f305a80ccf8841a36a5e7bda74
 2021-07-16 16:38:19 +00:00
Treehugger Robot
866b9c4480 Merge "No-op cleanup" am: 21592b0d93 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769285

Change-Id: I4ea2b3bd3ab5f8c58aca5ca602e22a67f6f8e0d1
 2021-07-16 16:25:17 +00:00
Treehugger Robot
21592b0d93 Merge "No-op cleanup" 2021-07-16 16:08:05 +00:00
Remi NGUYEN VAN
fd5d3a5617 Merge "Add ConnectivityCoverageTests to presubmit" am: 0909afc08a am: 4d5342d396 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768348

Change-Id: I39afdc1740908dbcd7e5fdf87f66a955b4108538
 2021-07-16 06:46:06 +00:00
Remi NGUYEN VAN
c4a7f75dc8 Merge "Move ConnectivityCoverageTests to mainline-presubmit" am: 7d4ab94bc6 am: dfc744c81e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754249

Change-Id: If0dee06aa3865ebdb232ebcf39c646fa7e993092
 2021-07-16 06:45:59 +00:00
Remi NGUYEN VAN
4d5342d396 Merge "Add ConnectivityCoverageTests to presubmit" am: 0909afc08a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768348

Change-Id: Ia83ac341917eee98078d6328f66d90b5a42fa028
 2021-07-16 06:31:02 +00:00
Remi NGUYEN VAN
dfc744c81e Merge "Move ConnectivityCoverageTests to mainline-presubmit" am: 7d4ab94bc6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754249

Change-Id: I2858a01588c723da64efba2e110097d58b868e86
 2021-07-16 06:30:51 +00:00
Remi NGUYEN VAN
0909afc08a Merge "Add ConnectivityCoverageTests to presubmit" 2021-07-16 06:20:00 +00:00
Remi NGUYEN VAN
7d4ab94bc6 Merge "Move ConnectivityCoverageTests to mainline-presubmit" 2021-07-16 06:19:10 +00:00
Chalard Jean
6d8f2fbf99 No-op cleanup 
Test: atest ConnectivityServiceTest
Change-Id: Ic07c94785d97bd654ffce960e8bc2652c2dbc3d6
 2021-07-16 12:02:22 +09:00