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
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
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
bacc77848a
[automerger skipped] Merge "Update TetheringTests for new connectivity shims" am: 86b39c8c34 am: 7d70169cee -s ours am: 923b92412c -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: Iaf1bbce50ce7cc4b43886b4856b9d6a3513d44b3
2021-06-25 06:21:46 +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
954a86238e
Merge "Add back tethering to mainline-postsubmit" into sc-dev am: d5532eac04 am: c990d821f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076672
Change-Id: Ib6c27827db5d69adebb3019cf2fd9cff438c8fc2
2021-06-25 01:06:54 +00:00
Remi NGUYEN VAN
799008aa17
Merge "Add back tethering to mainline-postsubmit" into sc-dev am: d5532eac04 am: 4fdedda16b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076672
Change-Id: I1c475c0e5712aea209399774945c2aa784eda196
2021-06-25 01:02:13 +00:00
Remi NGUYEN VAN
c990d821f9
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: I57cc02aef4bad5f1e17d7b5065dc755c389196e2
2021-06-25 00:52:43 +00: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
aa6039f99a
[automerger skipped] Merge changes from topic "sp31" am: a6cb322d00 am: cf7235f706 -s ours am: 5f63d2ab1e -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: Ic7197c8eceaef3b187285dae55d2116f025948ad
2021-06-24 11:17:40 +00:00
junyulai
5243b4ba65
[automerger skipped] [SP34] Adapt onSetWarningAndLimit am: da52dab266 am: c6575b5215 -s ours am: a0a61c5e1d -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: I2e1f03ad459b098cc398da1163119a3ac05fb1c2
2021-06-24 11:17:38 +00:00
junyulai
10ba42da5a
[automerger skipped] [SP33] Adapt ITetheringOffloadCallback V1.1 am: 37a7e620b4 am: 3cf91882f1 -s ours am: 8211a52b00 -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: Iac5653962507a0e297df416d208b2af9e3ab4660
2021-06-24 11:17:36 +00:00
Chalard Jean
00660c5f37
[automerger skipped] Address comments on ag/14486203 am: 20c7cad598 am: a7697d1718 -s ours am: 7f540b0f11 -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: If66f7e798ce4bee0f76fcd687b262489a00eda8d
2021-06-24 11:17:34 +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
8b86e2c0c7
[automerger skipped] Add CTS for BatteryStatsManager new API am: 9d3a5ede58 am: b0a55740ab -s ours
...
am skip reason: Merged-In I654b8920d6ea1dada782a618776b13870f7f98df with SHA-1 9d3a5ede58 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15082047
Change-Id: I7cf432e07dc2fd259329e7117ea725f251cd7de2
2021-06-24 10:03:50 +00:00
Lorenzo Colitti
bdf32b41f8
[automerger skipped] Add CTS for BatteryStatsManager new API am: 9d3a5ede58 -s ours am: 6f084e2ad4 -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: I928c81f6dc58facbea33bde29fc8a2f7c9244c9d
2021-06-24 09:55:22 +00:00
Lorenzo Colitti
b0a55740ab
Add CTS for BatteryStatsManager new API am: 9d3a5ede58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15082047
Change-Id: Ie217e2bec3c63284f73cedabb035f7d079fa8121
2021-06-24 09:44: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
5d3a9f6bf2
[automerger skipped] Merge changes Ib8637100,I33612650 am: d4c644cf4d am: bd9ed64c5d -s ours am: 70a88a334c -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: I2c94dcffe9ead8ee62e131893f2df50fd90be6c9
2021-06-24 09:02:46 +00:00
Junyu Lai
a740f69294
[automerger skipped] Add more unit tests for ConnectivityManager S APIs am: 92c29c56d7 am: 6c5bd7dfec -s ours am: 2d5a879566 -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: Ib65233c7e9a72f2732e5990e2ef10f98d6b7096d
2021-06-24 09:02:43 +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
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
Remi NGUYEN VAN
11e5cf0b0b
Update TetheringTests for new connectivity shims
...
The stable connectivity shims are updated to now contain S API, so
tethering tests that assumed that compatibility R behavior was used need
to be updated.
To avoid such failures Tethering tests should have a test target using
updated shims (TetheringNextTests), but this was not done in S
timeframe.
Bug: 189581241
Test: atest TetheringTests
Merged-In: Ibc04e64a1e9d82b67aff10d1a6d77f9e6b1bbdfb
Change-Id: Ibc04e64a1e9d82b67aff10d1a6d77f9e6b1bbdfb
2021-06-24 17:17:54 +09: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
36ef90effc
Merge "Add ConnectivityCoverageTests to postsubmit" am: 09d3a75357
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736506
Change-Id: I20dddc023276fc22e11926a3df9c7a9179d8613c
2021-06-24 06:44:48 +00:00