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

42270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nucca Chen
2791e3fe11 Merge "Refresh conntrack entry timeout" am: a569410667 am: a729b103ff 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1566871

Change-Id: I5508b5b47d17c01d2ce95fb30d9dfc14e279f932
 2021-06-25 18:55:47 +00:00
Nucca Chen
8516b3f120 Merge "Clear IPv4 offload rules when tethering stopped" am: 7238b31c15 am: 70504b2f6b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579873

Change-Id: Ibfea3e14e0e06a59c3b29534ab5ffbf4d4bd2148
 2021-06-25 18:55:09 +00:00
Nucca Chen
a729b103ff Merge "Refresh conntrack entry timeout" am: a569410667 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1566871

Change-Id: I13894c11c848b85d4647ffecb359420421839896
 2021-06-25 18:45:23 +00:00
Nucca Chen
70504b2f6b Merge "Clear IPv4 offload rules when tethering stopped" am: 7238b31c15 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579873

Change-Id: I61fccead9b9fdd7a2553fe57b5734d67f3eff59a
 2021-06-25 18:41:30 +00:00
Nucca Chen
a569410667 Merge "Refresh conntrack entry timeout" 2021-06-25 18:34:22 +00:00
Nucca Chen
7238b31c15 Merge "Clear IPv4 offload rules when tethering stopped" 2021-06-25 17:56:21 +00:00
Junyu Lai
768c00f18f [automerger skipped] Merge changes I81bf8969,I2edba513,Ibb913979 am: c06260b5b5 am: b1ef107d82 -s ours 
am skip reason: Merged-In I81bf8969ace3cb6826b30c5bbd0b896c64c73c57 with SHA-1 ee93b3d3b3 is already in history

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

Change-Id: I7d8c1861abf4e112d96a81c887cbf1afda20b337
 2021-06-25 15:54:33 +00:00
Chalard Jean
925257538c [automerger skipped] Add some CTS tests for NetworkScore. am: b8c396b3b5 am: 35eddb4f18 -s ours 
am skip reason: Merged-In I2edba51351cd4c71727663aa85b1d5141bff2a15 with SHA-1 2d2ecc3cfb is already in history

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

Change-Id: I8c8a125c67e1a3c3f3acc2e959a3d0ba76b44bbb
 2021-06-25 15:54:32 +00:00
Chalard Jean
311b91f349 [automerger skipped] Add a first CTS for NetworkScore am: e349356eb9 am: 04014f708c -s ours 
am skip reason: Merged-In Ibb9139798ce44d748e87bae79a1e23311ec8d9b6 with SHA-1 aac204b202 is already in history

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

Change-Id: Id86796610650107378c591bf14372881c145e80d
 2021-06-25 15:54:30 +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
b1ef107d82 Merge changes I81bf8969,I2edba513,Ibb913979 am: c06260b5b5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744648

Change-Id: I101d828b6cafc7656913a7946062099034ed63db
 2021-06-25 15:42:42 +00:00
Chalard Jean
35eddb4f18 Add some CTS tests for NetworkScore. am: b8c396b3b5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744647

Change-Id: I1f0d927ec4cb0d4e286c21faf769ab775d0aa85a
 2021-06-25 15:42:41 +00:00
Chalard Jean
04014f708c Add a first CTS for NetworkScore am: e349356eb9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744646

Change-Id: I3c971e176fe42cac13414346e84f77c3ddb8b9f0
 2021-06-25 15:42:39 +00:00
Junyu Lai
9c5e87388d Merge "Check null NetworkSpecifier before redacting" am: 435c4f7fc5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1747893

Change-Id: Id055ea401aefe3f8500e3f78d059a5fa187659fc
 2021-06-25 15:41:35 +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
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
530af4bc13 Merge "Remove usage of internal APIs from InetAddress and ServerSocket" am: c577c271ba 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737102

Change-Id: Ib9be6dd9c82c00e36eab3c9490a69d71e3dfbc4e
 2021-06-25 11:04:48 +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
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
923b92412c [automerger skipped] Merge "Update TetheringTests for new connectivity shims" am: 86b39c8c34 am: 7d70169cee -s ours 
am skip reason: Merged-In Ibc04e64a1e9d82b67aff10d1a6d77f9e6b1bbdfb with SHA-1 c94a1ffd55 is already in history

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

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

Change-Id: If2590a469d61cd34b702fb6ca9c57ef026221540
 2021-06-25 05:52:54 +00:00
Remi NGUYEN VAN
7d70169cee Merge "Update TetheringTests for new connectivity shims" am: 86b39c8c34 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733778

Change-Id: I56d689d76d6fbf9ee318f63674fdef8bf1021d91
 2021-06-25 05:52:37 +00:00
Remi NGUYEN VAN
ef34fd2e21 Merge "Skip connectivity unit tests before S" 2021-06-25 05:43:30 +00:00
Remi NGUYEN VAN
86b39c8c34 Merge "Update TetheringTests for new connectivity shims" 2021-06-25 05:42:14 +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
Remi NGUYEN VAN
4fdedda16b Merge "Add back tethering to mainline-postsubmit" into sc-dev am: d5532eac04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076672

Change-Id: I11035b67d6ab20c824a569e7d8992ee2e11a678b
 2021-06-25 00:51:47 +00:00
Remi NGUYEN VAN
d5532eac04 Merge "Add back tethering to mainline-postsubmit" into sc-dev 2021-06-25 00:42:10 +00:00
Junyu Lai
5f63d2ab1e [automerger skipped] Merge changes from topic "sp31" am: a6cb322d00 am: cf7235f706 -s ours 
am skip reason: Merged-In Ie49461694d77ab7f25a549433b01b5b0167bd489 with SHA-1 a36f33ef90 is already in history

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

Change-Id: Ief7c84007da4563c2fda043c529cb3a673278064
 2021-06-24 10:57:59 +00:00
junyulai
a0a61c5e1d [automerger skipped] [SP34] Adapt onSetWarningAndLimit am: da52dab266 am: c6575b5215 -s ours 
am skip reason: Merged-In Iec01cb01fd1ce481ce0bd736762baddde1e38084 with SHA-1 6d8da9f72d is already in history

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

Change-Id: If1f2d4a582f146279508c57727fa4fae818ac362
 2021-06-24 10:57:57 +00:00
junyulai
8211a52b00 [automerger skipped] [SP33] Adapt ITetheringOffloadCallback V1.1 am: 37a7e620b4 am: 3cf91882f1 -s ours 
am skip reason: Merged-In I6505a04de8c57357dd1fa9ce898c13395e497816 with SHA-1 5454e8978e is already in history

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

Change-Id: I316169f5a174863d908ee631c9fe90f0d262f749
 2021-06-24 10:57:56 +00:00
Chalard Jean
7f540b0f11 [automerger skipped] Address comments on ag/14486203 am: 20c7cad598 am: a7697d1718 -s ours 
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I93df35e2457bf7600e061af894cc1dd50e490d04
 2021-06-24 10:57:53 +00:00
Junyu Lai
cf7235f706 Merge changes from topic "sp31" am: a6cb322d00 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626082

Change-Id: I906d49ba06054f124e60f39ed40c40472e28546d
 2021-06-24 10:41:43 +00:00
junyulai
c6575b5215 [SP34] Adapt onSetWarningAndLimit am: da52dab266 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626081

Change-Id: Id0d1dbe3276b4c16f684109fa55ffe5c5343ed42
 2021-06-24 10:41:41 +00:00
junyulai
3cf91882f1 [SP33] Adapt ITetheringOffloadCallback V1.1 am: 37a7e620b4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626080

Change-Id: I70100d1ad855a7963cfc2c4d9de288bc2e8fe4b0
 2021-06-24 10:41:39 +00:00
Chalard Jean
a7697d1718 Address comments on ag/14486203 am: 20c7cad598 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744649

Change-Id: Icfbf8cb124277e54fad40d6d4e558b76d904fdba
 2021-06-24 10:41:33 +00:00
Junyu Lai
a6cb322d00 Merge changes from topic "sp31" 
* changes:
  [SP35] Pass data warning to tethering offload
  [SP34] Adapt onSetWarningAndLimit
  [SP33] Adapt ITetheringOffloadCallback V1.1
  Address comments on ag/14486203
 2021-06-24 10:21:07 +00:00
Lorenzo Colitti
6f084e2ad4 [automerger skipped] Add CTS for BatteryStatsManager new API am: 9d3a5ede58 -s ours 
am skip reason: Merged-In I654b8920d6ea1dada782a618776b13870f7f98df with SHA-1 f52a30b605 is already in history

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

Change-Id: I6c9246842aa0955735921d4ba4f403ed042b19f8
 2021-06-24 09:42:22 +00:00
Junyu Lai
70a88a334c [automerger skipped] Merge changes Ib8637100,I33612650 am: d4c644cf4d am: bd9ed64c5d -s ours 
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I54db0fac61cf527cb892980b3062bfdf1f905784
 2021-06-24 08:47:43 +00:00
Junyu Lai
2d5a879566 [automerger skipped] Add more unit tests for ConnectivityManager S APIs am: 92c29c56d7 am: 6c5bd7dfec -s ours 
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I0266a9d85877d0afc673f2a517a2c8ab8208284e
 2021-06-24 08:47:41 +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
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
junyulai
da52dab266 [SP34] Adapt onSetWarningAndLimit 
This is a no-op change that just adapt new API from
NetworkStatsProvider to get warning and limit bytes at the same
time. This change also stores them locally for subsequent
patches to set warning bytes to hardware.

Test: Will be included in the subsequent patch.
Bug: 149467454
Merged-In: Iec01cb01fd1ce481ce0bd736762baddde1e38084
Change-Id: Iec01cb01fd1ce481ce0bd736762baddde1e38084
  (cherry-picked from ag/13981691)
 2021-06-24 08:33:28 +00:00
junyulai
37a7e620b4 [SP33] Adapt ITetheringOffloadCallback V1.1 
This is a no-op change that redirect both V1.0 and V1.1 callback
events to the same handling function. Since the V1.1 callback
is extended from V1.0 callback, we can safely use V1.1
callback for both V1.0 and V1.1 control.

The change also provides interface for subsequent
OffloadController changes to set warning and limit at the
same time.

Test: atest TetheringTests
Bug: 149467454
Merged-In: I6505a04de8c57357dd1fa9ce898c13395e497816
Change-Id: I6505a04de8c57357dd1fa9ce898c13395e497816
  (cherry-picked from ag/13973147)
 2021-06-24 08:33:28 +00:00
junyulai
991433d8c8 [SP35] Pass data warning to tethering offload 
This is supported by:
  1. Utilize the new API from both NetworkStatsProvider
     and IOffloadControl to send data warning quota to hardware.
     And pass the warning reached notification back to NPMS.
  2. Disable software solution introduced in R release for
     V1.1+ hardware, since now we can fully offload data warning
     and limit notification to hardware.

Test: atest TetheringTests
Fix: 149467454
Merged-In: Ie49461694d77ab7f25a549433b01b5b0167bd489
Change-Id: Ie49461694d77ab7f25a549433b01b5b0167bd489
  (cherry-picked from ag/13981692)
 2021-06-24 08:33:28 +00:00
Chalard Jean
20c7cad598 Address comments on ag/14486203 
Bug: 186458024
Test: comment-only change
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I7b086abbb57354086e8fb1a41c63140f2227173f
Change-Id: I7b086abbb57354086e8fb1a41c63140f2227173f
  (cherry-picked from ag/14540395)
 2021-06-24 08:33:27 +00:00
Junyu Lai
bd9ed64c5d Merge changes Ib8637100,I33612650 am: d4c644cf4d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744645

Change-Id: I859f6f74f429cca50f7d756f549e285b13b3cfa0
 2021-06-24 08:25:06 +00:00
Junyu Lai
6c5bd7dfec Add more unit tests for ConnectivityManager S APIs am: 92c29c56d7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744644

Change-Id: I736479309e7ba9b4db6c1a722ba5de7b6e03f850
 2021-06-24 08:25:01 +00:00