Commit Graph

3176 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
8f05a361da Merge "Fix null PendingIntent in network listens" am: 27a942cb32 am: 78aa9a4bdc am: 8c89161b52
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153

Change-Id: I11eeb5b4c8d25d116dd967be0157e7603ed0a8be
2021-06-28 07:52:06 +00:00
Remi NGUYEN VAN
8c89161b52 Merge "Fix null PendingIntent in network listens" am: 27a942cb32 am: 78aa9a4bdc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153

Change-Id: I93002b6e1f6a40af501f8af6721865dbdc329984
2021-06-28 07:40:20 +00:00
Remi NGUYEN VAN
27a942cb32 Merge "Fix null PendingIntent in network listens" 2021-06-28 07:11:31 +00:00
Treehugger Robot
a8a30e8722 Merge "Move test_mainline_modules to AndroidTest.xml" am: abbee98e86 am: 6709c9b056 am: 2b373de5a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748157

Change-Id: I9e0c74fe6c55a5efdfd67c064915e823689109a6
2021-06-28 07:07:11 +00:00
Treehugger Robot
2b373de5a4 Merge "Move test_mainline_modules to AndroidTest.xml" am: abbee98e86 am: 6709c9b056
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748157

Change-Id: Idf16454383a65e6ccc1c4672c7d83e8742512ea7
2021-06-28 06:57:47 +00:00
Treehugger Robot
abbee98e86 Merge "Move test_mainline_modules to AndroidTest.xml" 2021-06-28 06:27:42 +00:00
Paul Hu
1b4fd02912 Merge "Use appId instead of uid" am: 683c386403 am: 9658c8ea69 am: e6e75faf1d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733212

Change-Id: I553d03b3bfd2855d4d257e2f09e758f8a5d8b796
2021-06-28 04:18:38 +00:00
Paul Hu
e6e75faf1d Merge "Use appId instead of uid" am: 683c386403 am: 9658c8ea69
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733212

Change-Id: Ic23e289c26e4b61864d1343eb0e6494f8cd43587
2021-06-28 04:07:10 +00:00
Paul Hu
683c386403 Merge "Use appId instead of uid" 2021-06-28 03:35:45 +00:00
Remi NGUYEN VAN
8b2a47c867 Move test_mainline_modules to AndroidTest.xml
When an AndroidTest.xml is used, configuration needs to be in the
AndroidTest.xml file, not in the Android.bp.

This currently causes tests not to be run in TEST_MAPPING as they should
be.

Test: TH needs to test
Bug: 187935317
Change-Id: Ie0aca0c64646825175769cd375bcecf65de4b4c8
2021-06-28 10:55:15 +09:00
Remi NGUYEN VAN
1e238a87e9 Fix null PendingIntent in network listens
In S ConnectivityService was changed to use getActiveRequest() to fill
EXTRA_NETWORK_REQUEST, but there is no active request in the case of
listens.

When getActiveRequest() is missing, use the first mRequest instead. This
should match previous behavior.

Bug: 191713869
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: Id7343a4cc020aba16b7979b16334721c56b2839c
2021-06-28 09:14:30 +09:00
Junyu Lai
6a1c975562 Merge "Check null NetworkSpecifier before redacting" am: 435c4f7fc5 am: 9c5e87388d am: 6efa057bf5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1747893

Change-Id: I5ebb779b147125295d355ca6d3654a13202175f5
2021-06-25 16:10:58 +00:00
Junyu Lai
6efa057bf5 Merge "Check null NetworkSpecifier before redacting" am: 435c4f7fc5 am: 9c5e87388d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1747893

Change-Id: I7e317ebb77d921c50e21a6a710e388e453cdfe62
2021-06-25 15:54:20 +00:00
Junyu Lai
c06260b5b5 Merge changes I81bf8969,I2edba513,Ibb913979
* changes:
  Add CTS for NetworkScore.setTransportPrimary
  Add some CTS tests for NetworkScore.
  Add a first CTS for NetworkScore
2021-06-25 15:28:27 +00:00
Junyu Lai
435c4f7fc5 Merge "Check null NetworkSpecifier before redacting" 2021-06-25 15:27:55 +00:00
vichang
3def11a01c Merge "Remove usage of internal APIs from InetAddress and ServerSocket" am: c577c271ba am: 530af4bc13 am: 637b44ffed
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737102

Change-Id: I28cddfe12300faaf44c369c200e9de05d8768a5a
2021-06-25 11:26:46 +00:00
vichang
637b44ffed Merge "Remove usage of internal APIs from InetAddress and ServerSocket" am: c577c271ba am: 530af4bc13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737102

Change-Id: I6a617ff3c6e8dbbe49459a12169ce42a85f801e3
2021-06-25 11:17:20 +00:00
vichang
c577c271ba Merge "Remove usage of internal APIs from InetAddress and ServerSocket" 2021-06-25 10:54:52 +00:00
Junyu Lai
144b6c742a Check null NetworkSpecifier before redacting
Do null check before redacting, since NetworkSpecifier will not
always be attached. For example, NetworkSpecifier of wifi
network is only attached when a wifi network is created
in response to a network request with specifier attached.

Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots \
      --rerun-until-failure 100
      (tested on cuttlefish mobile and wifi)
Bug: 191944987
Change-Id: I5df3547995111fe6340facb94a577296d2228694
2021-06-25 08:24:12 +00:00
Remi NGUYEN VAN
c4880c58d9 Merge "Skip connectivity unit tests before S" am: ef34fd2e21 am: 7ab2d7440c am: 1e832f336b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736507

Change-Id: I1f954a876a095bf2ead8344f8f601ef03402a6a1
2021-06-25 06:21:56 +00:00
Remi NGUYEN VAN
1e832f336b Merge "Skip connectivity unit tests before S" am: ef34fd2e21 am: 7ab2d7440c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736507

Change-Id: I8f1d639243617f21ab220685108adab2a3e8d3a3
2021-06-25 06:07:10 +00:00
Remi NGUYEN VAN
05dd1ba540 Skip connectivity unit tests before S
The tests are packaged together with other tests in a common coverage
suite, so need to be individually annotated so that they are skipped
before S.

They do not need to pass on platforms older than S, because such
platforms will not updated with the code that is tested.

Bug: 187935317
Test: atest ConnectivityCoverageTests on R
Change-Id: I10da45ae023e7f1e8cd11ec857b84346892a3fa8
2021-06-25 10:10:12 +09:00
Chalard Jean
20a159633a Add CTS for NetworkScore.setTransportPrimary
Bug: 184037351
Test: this
Merged-In: I81bf8969ace3cb6826b30c5bbd0b896c64c73c57
Change-Id: I81bf8969ace3cb6826b30c5bbd0b896c64c73c57
  (cherry-picked from ag/14452540)
2021-06-24 08:33:28 +00:00
Chalard Jean
b8c396b3b5 Add some CTS tests for NetworkScore.
Bug: 184037351
Test: this
Merged-In: I2edba51351cd4c71727663aa85b1d5141bff2a15
Change-Id: I2edba51351cd4c71727663aa85b1d5141bff2a15
  (cherry-picked from ag/14452538)
2021-06-24 08:33:28 +00:00
Chalard Jean
e349356eb9 Add a first CTS for NetworkScore
In an effort to make reviewing easier, this implements most of
the infra but only a mostly trivial test.

Bug: 184037351
Test: this
Merged-In: Ibb9139798ce44d748e87bae79a1e23311ec8d9b6
Change-Id: Ibb9139798ce44d748e87bae79a1e23311ec8d9b6
  (cherry-picked from ag/14452537)
2021-06-24 08:33:28 +00:00
Junyu Lai
d4c644cf4d Merge changes Ib8637100,I33612650
* changes:
  Make yield-to-bad-wifi behavior backward compatible with R
  Add more unit tests for ConnectivityManager S APIs
2021-06-24 08:13:46 +00:00
Remi NGUYEN VAN
bd2f0e0c53 Merge "Add ConnectivityCoverageTests to postsubmit" am: 09d3a75357 am: 36ef90effc am: 105b983c83
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736506

Change-Id: I03431e94633c42115c4016a51932338856ab5976
2021-06-24 07:19:33 +00:00
Remi NGUYEN VAN
105b983c83 Merge "Add ConnectivityCoverageTests to postsubmit" am: 09d3a75357 am: 36ef90effc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736506

Change-Id: I03ee6f85d23b0c4a10ce4da432144b614c4d57dc
2021-06-24 07:02:25 +00:00
Remi NGUYEN VAN
09d3a75357 Merge "Add ConnectivityCoverageTests to postsubmit" 2021-06-24 06:32:36 +00:00
Chalard Jean
6b2f09272c Make yield-to-bad-wifi behavior backward compatible with R
Yielding cell wins to exiting wifi (whether good or bad).
It loses to bad wifi that's not exiting.

In R, yielding to bad wifi only affects wifis that are
unvalidated, but a wifi that is exiting should still be
dropped in favor of a cell that yields to bad wifi.

I had misunderstood the policy and implemented it wrong.
Now it's implemented right, and has careful tests.

Test: new tests for this
Bug: 186458024
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Ib8637100d491e72a2edb837584ce55b7dda58524
Change-Id: Ib8637100d491e72a2edb837584ce55b7dda58524
  (cherry-picked from ag/14486203)
2021-06-24 03:33:05 +00:00
Junyu Lai
92c29c56d7 Add more unit tests for ConnectivityManager S APIs
Test: atest android.net.ConnectivityManagerTest
Bug: 188657173
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I33612650eb89486a14fcfc440ba0c357f4bb513c
Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c
  (cherry-picked from ag/14640282)
2021-06-24 03:20:39 +00:00
Lorenzo Colitti
65e2a4fbf4 Merge "Add CTS for BatteryStatsManager new API" am: 7325c86c26 am: f6a5b59f5a am: f830039f69
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722770

Change-Id: Icd5aff1f2beff6a8ce052746369b7e7e49377d29
2021-06-24 03:14:29 +00:00
Lorenzo Colitti
f830039f69 Merge "Add CTS for BatteryStatsManager new API" am: 7325c86c26 am: f6a5b59f5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722770

Change-Id: Ib9b0f4ae0b94163727c4c52b7f9ba852db43ffd6
2021-06-24 02:57:32 +00:00
Lorenzo Colitti
7325c86c26 Merge "Add CTS for BatteryStatsManager new API" 2021-06-24 02:26:53 +00:00
Aaron Huang
f52a30b605 Add CTS for BatteryStatsManager new API
Bug: 189308158
Test: This test and
      run testReportNetworkInterfaceForTransports
      with --rerun-until-failure 500
Change-Id: I654b8920d6ea1dada782a618776b13870f7f98df
2021-06-24 07:19:33 +08:00
Paul Hu
438c3dda3d Merge "Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks" am: 33b4929cfe am: 33ebb2d0af am: 859611dfa4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740740

Change-Id: I2f52ca9a624fea496d8cce9ee83a22db48c1cb27
2021-06-23 17:08:55 +00:00
Paul Hu
859611dfa4 Merge "Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks" am: 33b4929cfe am: 33ebb2d0af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740740

Change-Id: I703b9839f0e2e59c57e03bd2dfc31f1932f8c02c
2021-06-23 17:08:41 +00:00
Paul Hu
33b4929cfe Merge "Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks" 2021-06-23 16:30:57 +00:00
Chiachang Wang
bc0fe90ae8 Merge "Add test for CM#setAvoidUnvalidated" am: 13549792e2 am: eaf5893102 am: ef570996db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733789

Change-Id: Iff83b8640006b1d06bfbbcf547d69c863019ad27
2021-06-23 10:11:02 +00:00
Chiachang Wang
ef570996db Merge "Add test for CM#setAvoidUnvalidated" am: 13549792e2 am: eaf5893102
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733789

Change-Id: Ibf57a8fe0f49763b2bf1f7fe06c42851dde905cf
2021-06-23 09:51:28 +00:00
Chiachang Wang
13549792e2 Merge "Add test for CM#setAvoidUnvalidated" 2021-06-23 09:19:51 +00:00
Remi NGUYEN VAN
8b23feb10e Add ConnectivityCoverageTests to postsubmit
Add the tests to both postsubmit and mainline-postsubmit.

This should allow moving the tests to presubmit in the near future,
after they have been verified to pass in postsubmit.

Bug: 187935317
Test: treehugger needs to test
Change-Id: I9a05d6a300c5f777497e867d0456bc59b06eee80
2021-06-23 18:02:22 +09:00
paulhu
d266285172 Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks
Bug: 185149952
Test: atest ConnectivityManagerTest
Change-Id: Ie9391d9332ded58cf1e63c8c5c6f5ba85c950bc6
2021-06-23 08:01:00 +00:00
Remi NGUYEN VAN
d153afc4ce Merge "Added tests for QosCallback" am: 8ce48fe117 am: f4a7d4130f am: 2b2df6c85b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1558648

Change-Id: I2de9c412cb217f1972f3e6bc389fb9fbeac68540
2021-06-23 06:32:34 +00:00
Remi NGUYEN VAN
180a00fab9 Merge "Add basic tests for InvalidPacketException" am: eb0a4b41f8 am: b1eee18493 am: 2370c7cdf4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1742076

Change-Id: I496f4ae9afc8f67e7b656bb0155c2726b621a91a
2021-06-23 06:31:59 +00:00
Luke Huang
107e727906 Merge "Fix the comments from aosp/1719018" am: 0c20c4901f am: 9adee2f105 am: 226281b698
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729691

Change-Id: I33ee0df81faa88e955ed4c6c5cad8a6d27209fbf
2021-06-23 06:31:48 +00:00
Remi NGUYEN VAN
2b2df6c85b Merge "Added tests for QosCallback" am: 8ce48fe117 am: f4a7d4130f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1558648

Change-Id: Ic1e274100986681ac7d203ae6ad424387903e2a2
2021-06-23 06:30:09 +00:00
Remi NGUYEN VAN
2370c7cdf4 Merge "Add basic tests for InvalidPacketException" am: eb0a4b41f8 am: b1eee18493
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1742076

Change-Id: Ia8e3933f3abe69565e1b3e91fa38fff6ce0d36c5
2021-06-23 06:30:05 +00:00
Luke Huang
226281b698 Merge "Fix the comments from aosp/1719018" am: 0c20c4901f am: 9adee2f105
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729691

Change-Id: I65dd02aacd50acb92d15c76457f8415b0cc8b73e
2021-06-23 06:29:30 +00:00
Chiachang Wang
481040b43a Add test for CM#setAvoidUnvalidated
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I77dc5556458c2e824f7abd5a7b79e8aeed8dabf3
2021-06-23 13:54:04 +08:00