Commit Graph

10958 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
822ef077c6 Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404 am: f3b8223844 am: a8208c50f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4424773b4547c6f09a99024da94aefedd696552
2021-01-12 03:42:16 +00:00
Remi NGUYEN VAN
a8208c50f8 Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404 am: f3b8223844
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b6da2e75fce0274e64701cf79dca46abad0f60
2021-01-12 02:21:57 +00:00
Remi NGUYEN VAN
f3b8223844 Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15564a42939ccdc54954e4d130b6236bde94864b
2021-01-12 02:05:58 +00:00
Remi NGUYEN VAN
73fa31b404 Merge "Revert^2 "Add service-connectivity to tethering APEX"" 2021-01-12 01:35:30 +00:00
lucaslin
cb561f4183 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net am: ee661dfb59 am: 8c250ac624 am: 5970ac8892
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1517960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4883d85dcef3dcb9c56abdd4ab75f99cad2778f8
2021-01-11 02:52:05 +00:00
lucaslin
5970ac8892 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net am: ee661dfb59 am: 8c250ac624
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1517960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I859a59302fb71fae2da2ca229c706ff6c1f16408
2021-01-11 02:22:44 +00:00
lucaslin
8c250ac624 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net am: ee661dfb59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1517960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabf789de27e571c05bacb912d9c59a4357ffb549
2021-01-11 02:05:04 +00:00
lucaslin
ee661dfb59 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net
Move BaseNetdUnsolicitedEventListener to frameworks/libs/net and
create a new library - netd-client for using.
Also remove netd_aidl_interface-unstable-java since netd-client
links to the stable one.

Bug: 174837473
Test: Manual test and check the log.
Change-Id: Id65142b8c13a6cccbfe387d4ab757967497546e6
2021-01-08 01:55:53 +00:00
Remi NGUYEN VAN
2812f607a0 Revert^2 "Add service-connectivity to tethering APEX"
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.

This rolls forward the change. The original topic was reverted because
of a bad merged-in clause; this is fixed and re-verified in this topic.

Test: Boot, wifi connects and has internet access
Bug: 171540887

Change-Id: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-01-08 01:24:36 +00:00
Sudheer Shanka
8cee9bf1fc Merge "Increase the wait timeout for meteredness to change." am: edb6669cf1 am: eccfb47e5b am: da74e5086d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91e7df1632d46161a7821c6691fb9893ef53a79f
2021-01-07 23:49:48 +00:00
Sudheer Shanka
da74e5086d Merge "Increase the wait timeout for meteredness to change." am: edb6669cf1 am: eccfb47e5b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f843b19c377d54a9a6957080ccc93fe91e082e5
2021-01-07 23:34:37 +00:00
Sudheer Shanka
eccfb47e5b Merge "Increase the wait timeout for meteredness to change." am: edb6669cf1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9908365b2393fd718bd1a5cda4d6839bc96eb869
2021-01-07 23:15:29 +00:00
Sudheer Shanka
edb6669cf1 Merge "Increase the wait timeout for meteredness to change." 2021-01-07 22:56:48 +00:00
Treehugger Robot
c162a4323d Merge "Revert "Add service-connectivity to tethering APEX"" am: 4f430ae5ec am: 67650555b1 am: 42e3663c76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1541543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf32fc66b068b42f856044f00377fefc294f4ef6
2021-01-07 19:19:27 +00:00
Treehugger Robot
42e3663c76 Merge "Revert "Add service-connectivity to tethering APEX"" am: 4f430ae5ec am: 67650555b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1541543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77fdad4bf192ba260118f6ef2b7c2fd0b2ae3b3d
2021-01-07 18:48:00 +00:00
Treehugger Robot
67650555b1 Merge "Revert "Add service-connectivity to tethering APEX"" am: 4f430ae5ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1541543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9c9262fde00878772232e0428688a1b0e285fa9
2021-01-07 17:58:14 +00:00
Treehugger Robot
4f430ae5ec Merge "Revert "Add service-connectivity to tethering APEX"" 2021-01-07 15:25:03 +00:00
Pete Bentley
850ca6f6b4 Revert "Add service-connectivity to tethering APEX"
Revert "Set setCurrentProxyScriptUrl as public"

Revert submission 1532910-connectivity_jar_in_apex

Reason for revert: Breaks boot tests: b/176969905
Reverted Changes:
Ie41a5b569:Set setCurrentProxyScriptUrl as public
Id7b6a4664:Move service-connectivity to the tethering APEX
Ia7cb83834:Add service-connectivity to tethering APEX

Change-Id: I9f31d4810a92e620f02cc8d24bdf18fe28001a2b
2021-01-07 13:51:18 +00:00
Lorenzo Colitti
63f97b870d [automerger skipped] Merge "Add service-connectivity to tethering APEX" am: 7998551cdc am: 3ebe8d0394 am: 4b2bf51ef9 -s ours
am skip reason: Change-Id Ic496cd62be8c90928ccc619519ebe517beea78f0 with SHA-1 2a51c1086d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife9b3e32ec7d0985aededfe34d40f8b4b5c06bec
2021-01-07 10:09:49 +00:00
Lorenzo Colitti
4b2bf51ef9 Merge "Add service-connectivity to tethering APEX" am: 7998551cdc am: 3ebe8d0394
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f1f8a73b73277709568a79b623fa88f13b95179
2021-01-07 09:49:41 +00:00
Lorenzo Colitti
3ebe8d0394 Merge "Add service-connectivity to tethering APEX" am: 7998551cdc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c0d1b1c0247d66f9a962da824da73d05101774c
2021-01-07 09:26:30 +00:00
Lorenzo Colitti
7998551cdc Merge "Add service-connectivity to tethering APEX" 2021-01-07 08:34:25 +00:00
Remi NGUYEN VAN
bd5cc4231d Add service-connectivity to tethering APEX
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.

Test: Boot, wifi connects and has internet access
Bug: 171540887
Merged-In: Ic496cd62be8c90928ccc619519ebe517beea78f0

Change-Id: Ia7cb83834b854e8c495c4ef17ec69ad032509208
2021-01-07 06:17:33 +00:00
Lorenzo Colitti
8c84db6854 [automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: c9c51b665d am: 39364945d5 am: efb9125a7f -s ours
am skip reason: Change-Id Ica51d0179bcb3b4e314d2c3e85709aead6ca5657 with SHA-1 afe26600fb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc7f85c3b4a67ff96fafbace6c9dc02b799cbe32
2021-01-06 15:22:38 +00:00
Lorenzo Colitti
efb9125a7f Merge "Migrate away from AsyncChannel in NetworkAgent" am: c9c51b665d am: 39364945d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie74232c341548340fd893783c8b7186f3f3cb2aa
2021-01-06 14:44:24 +00:00
Lorenzo Colitti
39364945d5 Merge "Migrate away from AsyncChannel in NetworkAgent" am: c9c51b665d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f81328223159acda1e642823ff7fd0a4df939b9
2021-01-06 14:26:24 +00:00
Lorenzo Colitti
c9c51b665d Merge "Migrate away from AsyncChannel in NetworkAgent" 2021-01-06 14:10:21 +00:00
Sudheer Shanka
796f29c09e Increase the wait timeout for meteredness to change.
Bug: 170241174
Bug: 174808291
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Change-Id: I3af17819a403958d88a30af7f6346e5bb96b2828
2021-01-05 06:37:56 +00:00
Chalard Jean
4f896db6ff Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657

Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657
2020-12-25 11:11:32 +09:00
Remi NGUYEN VAN
705499ecce Merge "Migrate away from AsyncChannel in NetworkAgent" 2020-12-25 01:57:44 +00:00
Chalard Jean
afe26600fb Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Exempt-From-Owner-Approval: Owners OOO, change approved by team members
Ignore-AOSP-First: merge conflicts in dependent changes
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657
2020-12-25 01:52:53 +00:00
Treehugger Robot
afa20212d2 [automerger skipped] Also update connected clients for local only tethering am: 6e7edee44b -s ours
am skip reason: Change-Id I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd with SHA-1 f50f05ebcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idba1d0dee301dfd9d069dd3f7f5eda1db7992c18
2020-12-24 07:16:13 +00:00
Treehugger Robot
6e7edee44b Also update connected clients for local only tethering
mForwardedDownstreams is the set of downstreams who wanted upstream.
In other word, it don't contains localOnly tethering(e.g. local only
hotspot, wifi p2p tethering). Changing the list from mForwardedDownstreams
to mNotifyList make both tethered and localOnly tethering have connected
clients callback.

Bug: 172290164
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1531561
Merged-In: I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd
Change-Id: I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd
2020-12-23 13:13:37 +00:00
Treehugger Robot
ee3f33ac41 Merge "Also update connected clients for local only tethering" am: 561f38a799 am: 1b1c4adab5 am: 8e1e05ec1e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bb18875a8c458c0ac112c13a277d4e563e3d8ac
2020-12-23 12:49:59 +00:00
Treehugger Robot
8e1e05ec1e Merge "Also update connected clients for local only tethering" am: 561f38a799 am: 1b1c4adab5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04ef025ed537623511a3d346d4c59d6efb6bef3f
2020-12-23 12:31:53 +00:00
Treehugger Robot
1b1c4adab5 Merge "Also update connected clients for local only tethering" am: 561f38a799
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac33537cf02456f4e1fce918ecfa7106749fcfd0
2020-12-23 12:14:19 +00:00
Treehugger Robot
561f38a799 Merge "Also update connected clients for local only tethering" 2020-12-23 11:36:34 +00:00
markchien
f50f05ebcb Also update connected clients for local only tethering
mForwardedDownstreams is the set of downstreams who wanted upstream.
In other word, it don't contains localOnly tethering(e.g. local only
hotspot, wifi p2p tethering). Changing the list from mForwardedDownstreams
to mNotifyList make both tethered and localOnly tethering have connected
clients callback.

Bug: 172290164
Test: atest TetheringTests
Change-Id: I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd
2020-12-22 23:23:09 +08:00
Chalard Jean
9c6593c0e8 [automerger skipped] Merge "Move module utils to the module package." am: fab11bb263 am: e3db31f347 am: f0c1648742 -s ours
am skip reason: Change-Id Ib04bebb061dc64d6d685116b596fb3179d5b959a with SHA-1 7f65953491 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I265fa049bd3b1a0e38524ff2bf0b939afbb97880
2020-12-22 06:58:32 +00:00
Chalard Jean
f0c1648742 Merge "Move module utils to the module package." am: fab11bb263 am: e3db31f347
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9c29e041caba754e4cb72167678234707484d3
2020-12-21 06:33:30 +00:00
Chalard Jean
e3db31f347 Merge "Move module utils to the module package." am: fab11bb263
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ef4ad9424dbe2ab620562276ba93da296e232b7
2020-12-21 06:11:51 +00:00
Remi NGUYEN VAN
7ecf53ec21 Fix timeout on NetworkAgentTest callback am: abb46bef36 am: 44cc38ce67 am: bc1e892463
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1530739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb92470433df1f096261968d9d10a1e314ab705b
2020-12-21 05:46:55 +00:00
Chalard Jean
fab11bb263 Merge "Move module utils to the module package." 2020-12-21 05:35:09 +00:00
Remi NGUYEN VAN
bc1e892463 Fix timeout on NetworkAgentTest callback am: abb46bef36 am: 44cc38ce67
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1530739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b96c910b95684b27ef8db2fa53c1b88953b6111
2020-12-21 05:21:03 +00:00
Remi NGUYEN VAN
44cc38ce67 Fix timeout on NetworkAgentTest callback am: abb46bef36
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1530739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide74cc0ae04e6ab900ec56bcaaf3f69c15c9679e
2020-12-21 05:03:19 +00:00
Orion Hodson
cba4648668 [automerger skipped] Use libnetjniutils for JNI File Descriptor info am: c544667c3c -s ours
am skip reason: Change-Id Ic1a1811ffb9a1c207f562a180417e99df31e3502 with SHA-1 e5bd0dba21 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc2fd9e62fa08e6fed4aa8036334061976554ef8
2020-12-21 02:20:48 +00:00
Orion Hodson
c544667c3c Use libnetjniutils for JNI File Descriptor info
Drops use of deprecated API in libnativehelper and uses a common
helper that will be stable across releases.

Bug: 158749603
Test: m
Change-Id: Ic1a1811ffb9a1c207f562a180417e99df31e3502
Merged-In: Ic1a1811ffb9a1c207f562a180417e99df31e3502
2020-12-17 03:09:55 +00:00
Remi NGUYEN VAN
abb46bef36 Fix timeout on NetworkAgentTest callback
All callbacks in the class use the DEFAULT_TIMEOUT_MS, except for this recently
added test.

The test is currently flaky in various branches.
Fixes: 174716714
Fixes: 174691729
Change-Id: I9f4446bb83eb4402c912292ac31d46e1d2cb6a52
Test: TH
2020-12-16 06:29:20 +00:00
Remi NGUYEN VAN
6a2a355206 Move cts/net/TEST_MAPPING to toplevel am: 9b6b353b5d am: 69963e8600 am: d2c83f152a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1529961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2778ead9d69a36d7e3b23be98e18b318f00f40b7
2020-12-16 03:20:33 +00:00
Chalard Jean
d2df5729f6 Move module utils to the module package.
Test: FrameworksWifiTest FrameworksNetTest
Merged-In: Ib04bebb061dc64d6d685116b596fb3179d5b959a
Change-Id: I9118da3898d864c7bf0ed7bc9d94b94343c4a084
2020-12-16 11:44:34 +09:00