Junyu Lai
a109d80a47
Merge "[FUI04] Refactor VpnInfo" am: 561626b20d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59054bfe1761e28cdfb8e8e6d67e4aabda399adc
2021-01-29 22:55:54 +00:00
junyulai
0592b920cb
[FUI04] Refactor VpnInfo
...
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
1. Change raw arrays into lists according to API guidelines.
2. Write test.
3. Rename class to UnderlyingNetworkInfo.
4. Rename vpnIface to iface.
5. Make underlyingIfaces @NonNull in order to adapt new
unparceling code.
6. implement equals and hashCode for testing.
Test: atest android.net.UnderlyingNetworkInfoTest
Bug: 174123988
Change-Id: I405c21e57c4af8a12a9dd0a1749b9e6690f87045
2021-01-29 17:44:32 +08:00
Treehugger Robot
9f37e0e929
Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: 9a9c17579a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
2021-01-27 13:57:34 +00:00
Treehugger Robot
9a9c17579a
Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
2021-01-27 13:11:28 +00:00
junyulai
67c69ad73f
[FUI03] No-op refactoring of VpnInfo
...
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
1. Move VpnInfo to android.net
2. Add nullability annotations
3. Make members final
Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
2021-01-27 15:03:06 +08:00
Chiachang Wang
9ee71fd652
Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 569e241d5c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13
2021-01-27 05:45:07 +00:00
Chiachang Wang
569e241d5c
Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iabe3fe4ab7fcad9e8c3f7ad89a49d3d5b1a874ce
2021-01-27 05:22:15 +00:00
Chiachang Wang
a034331a56
Expose UdpEncapsulationSocket.getResourceId()
...
ConnectivityManager.createSocketKeepalive() will need to get
the socket resource ID as a parameter for creating a new
NattSocketKeepalive. ConnectivityManager is a part of incoming
ConnectivityService mainline, so expose getResourceId() as an
API since the hidden APIs are not accessible for a mainline
module. This API should not be exposed to apps, so make it a
MODULE_LIBRARIES system API.
Bug: 172183305
Test: make update-api
Change-Id: Ic0722352ea186fcb18a2d91cc3969f771fde9e86
2021-01-27 09:27:26 +08:00
Treehugger Robot
1ec09a7e48
Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5 am: db887739f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31e71444d5b40981058b5a4152e5f1a0521527d0
2021-01-26 23:08:40 +00:00
Yan Yan
db45d09925
Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89 am: a1c981966e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I395e7b7ba8c5e1752ad162b0428597587e425e3c
2021-01-26 23:06:22 +00:00
Treehugger Robot
db887739f9
Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I27116d11a4a61c2ca76f687d8d47a4a973ae1e77
2021-01-26 13:49:20 +00:00
Treehugger Robot
6fe4b878e5
Merge changes I713bc2ec,Ib9ab07c9
...
* changes:
[FUI05] Remove wimax data usage unit test
[FUI14] Get SSID from NetworkCapabilities
2021-01-26 13:13:24 +00:00
Yan Yan
a1c981966e
Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I274765b51f942562dbe5683c9339866a0f55d13f
2021-01-26 03:51:17 +00:00
junyulai
c44d11ccec
[FUI14] Get SSID from NetworkCapabilities
...
This allows subsequent patches to remove the need of exposing
SSID in NetworkState.
Test: atest NetworkStatsServiceTest
Bug: 174123988
Change-Id: Ib9ab07c9610954c9a5de035a3aefbf6d0bb0b53b
2021-01-22 23:58:14 +08:00
Yan Yan
160aac3fa0
Expose IPsec tunnel APIs from @SystemApi to public APIs
...
Since IKE APIs to negotiate IPsec tunnel migration (MOBIKE) are
public, all IPsec tunnel APIs should also be public so that public
callers are able to create, manage and migrate IPsec tunnels
Bug: 174606949
Test: atest IpSecManagerTunnelTest
Change-Id: I86aec334cfc937953f9c2b411cc55862032aae4d
2021-01-21 10:45:24 -08:00
Treehugger Robot
62876cef3d
Merge "Pivot network statistics to use DataInput/Output." am: 5b322f10be am: 84dee682ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0502659732c1957b297095a5332e6dc0b514397
2021-01-08 11:33:57 +00:00
Treehugger Robot
84dee682ac
Merge "Pivot network statistics to use DataInput/Output." am: 5b322f10be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86021070223e8825ba19bd84946ef89b56dc3f35
2021-01-08 10:56:59 +00:00
Jeff Sharkey
1f69d15939
Pivot network statistics to use DataInput/Output.
...
Using these generalized interfaces is more flexible, since it enables
us to pivot the implementation being used internally. In particular,
an upcoming CL will pivot them to use a more efficient alternative.
This is a no-op refactoring.
Bug: 176777285
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ibd4717174cf1f136e9d5d80172ecb6e493265306
2021-01-06 18:48:12 -07:00
Remi NGUYEN VAN
cf254d6cb3
Merge "Register ethernet listeners on specific Executors" am: be4248226c am: 9dd482d23b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ca03d00b6ef646d055b49de4f0a3e5cf6cb992c
2020-12-28 08:21:06 +00:00
Remi NGUYEN VAN
9dd482d23b
Merge "Register ethernet listeners on specific Executors" am: be4248226c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2018d05f48c7977638808960e1d84fe57ee434a4
2020-12-28 07:41:53 +00:00
Remi NGUYEN VAN
be4248226c
Merge "Register ethernet listeners on specific Executors"
2020-12-28 07:12:45 +00:00
Serik Beketayev
51c010aacd
Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 9b3f669024
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
2020-12-25 09:45:54 +00:00
Serik Beketayev
9b3f669024
Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic839f183b48279532dcfb484818457a5372087b2
2020-12-25 09:21:03 +00:00
Baligh Uddin
feaf7a261e
Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a am: 95d6ec4a52
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533852
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie2588d9be48b50d41aaf5a5440268bb377081242
2020-12-24 06:50:43 +00:00
Baligh Uddin
95d6ec4a52
Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533852
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ief078339fcd28ea8899eceec6ec611429c30a2ae
2020-12-24 06:26:58 +00:00
Serik Beketayev
c809f6176b
[Mainline] Migrate ProxyInfo
...
Bug: 173455434
Test: atest FrameworksNetTests
Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
2020-12-23 22:15:51 -08:00
Baligh Uddin
67ba9e1d66
Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin
...
Migrate to packages/modules/Wifi. This CL will be presubmit tested
once migration is complete. This CL drops the code from
frameworks/base/wifi and migrated to packages/modules/Wifi.
Also adjusts visibility rules in frameworks/base/Android.bp
Bug: 137323948
Test: TH
Merged-In: I9031a37c84e17c2cf5c0552d1b33e8fd59216b92
Change-Id: I4ad80b1584f9f80dffed7786739b80f3aaf88cdc
2020-12-23 23:47:49 +00:00
Remi NGUYEN VAN
9c2a2705c7
Merge "Split NetworkUtils and NetworkUtilsInternal" am: 7adf0e84b8 am: d095d82c85
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b2eae7f9988ae8fa8c858709cafc17c1420f4b7
2020-12-23 02:07:05 +00:00
Remi NGUYEN VAN
d095d82c85
Merge "Split NetworkUtils and NetworkUtilsInternal" am: 7adf0e84b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa5503f829077f70803e2e865f58c6e4691d1a73
2020-12-23 01:37:12 +00:00
Remi NGUYEN VAN
7adf0e84b8
Merge "Split NetworkUtils and NetworkUtilsInternal"
2020-12-23 01:19:27 +00:00
Chalard Jean
cd5d9bd29e
Merge "Move module utils to the module package." am: eeb7c450aa am: 07d2787724
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406808
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb3306b246eb9cbe55352587dfd437e42b326b1f
2020-12-21 06:33:29 +00:00
Chalard Jean
07d2787724
Merge "Move module utils to the module package." am: eeb7c450aa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406808
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c42945df36d94e4abdf073fac17141f3b23d034
2020-12-21 06:11:51 +00:00
Chalard Jean
1c1883133b
Move module utils to the module package.
...
Test: FrameworksWifiTest FrameworksNetTest
Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25
Merged-In: I067eeecd458c34b7f2fbfa439072682661ac750c
2020-12-16 11:44:22 +09:00
Remi NGUYEN VAN
55838a8292
Register ethernet listeners on specific Executors
...
Have users of EthernetManager#addListener specify an Executor instead of
running callbacks on ConnectivityThread.
For existing clients, run callbacks on the common BackgroundThread.
This change in behavior is fine because addListener is not an API, the
threading model in Q was to run callbacks on the looper of the thread
that first created EthernetManager (so there is already no guarantee on
which thread is used), and the only users are in Settings.
ConnectivityThread is moving to a connectivity-specific JAR, so it
should not be used by external classes.
Bug: 174436414
Test: Ethernet client / tethering working
atest TetheringIntegrationTests
Change-Id: Ic9a959f89915329f79eeeaa0a210ad50811d1291
2020-12-15 17:57:32 +09:00
Xin Li
01e7f22043
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: efafd46947 -s ours am: 6fe90d9859 -s ours
...
am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic11fc264d783e729729854a5f7f7b03d38d43e3e
2020-12-10 03:47:00 +00:00
Xin Li
6fe90d9859
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: efafd46947 -s ours
...
am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1158b1e4f70b018504c963a76782c8773f698118
2020-12-10 03:05:40 +00:00
Xin Li
efafd46947
Merge "DO NOT MERGE - Merge Android R QPR1"
2020-12-10 02:18:27 +00:00
Xin Li
449272426d
DO NOT MERGE - Merge Android R QPR1
...
Bug: 172690556
Merged-In: Ib81ba3288a986546bc570c3759c55d026add591a
Change-Id: I2acfeb6cfc83a80056a685355cc367a5514da069
2020-12-09 17:55:44 -08:00
Serik Beketayev
fd6dd089a8
Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: 6f3c1295e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f91f6de3af919fff42383ba86617112624c8292
2020-12-10 00:49:48 +00:00
Serik Beketayev
6f3c1295e9
Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc0a49e76f87a741f4410b53e9a40012e37fde36
2020-12-10 00:08:03 +00:00
Remi NGUYEN VAN
8ce3c4680d
Split NetworkUtils and NetworkUtilsInternal
...
NetworkUtils is planned to move to a dedicated JAR for connectivity
classes, while NetworkUtilsInternal would stay in the
frameworks-minus-apex JAR, in the com.android.internal.net package.
Bug: 171540887
Test: m, boots, wifi working
atest FrameworksNetTests
Change-Id: I3d38d72ad23a4bf84af823c7baeb6fed25c0665f
2020-12-07 19:41:49 +09:00
Serik Beketayev
7f507337a7
[Mainline Migration] Migrate NetworkUtils
...
Migrating makeStrings(), numericToInetAddress() APIs
Bug: 173089079
Test: atest FrameworksNetTests
Change-Id: Ie914fd41bc3ce16d07f5d2768b89ce805b9245a9
2020-12-06 22:33:04 -08:00
Treehugger Robot
702c455bae
Merge "Remove NATT keepalive from IpSecTransform" am: ef8a605c6f am: 1453310967
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881
Change-Id: I2ca38b60003595a59deff3b12614f3a8950da91f
2020-12-04 04:12:38 +00:00
Remi NGUYEN VAN
e0e8a8bf97
Merge "Set NetworkIdentity subscriberId on all networks" am: 1ded24221e am: f055bbd349
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512877
Change-Id: Ib1009d0ce0e54330c00aee7fa1c45abe43c86777
2020-12-04 04:11:56 +00:00
Treehugger Robot
1453310967
Merge "Remove NATT keepalive from IpSecTransform" am: ef8a605c6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881
Change-Id: I6a0e26ee28e1b9bb0906c840826b7a9ddc88a818
2020-12-04 03:56:01 +00:00
Remi NGUYEN VAN
f055bbd349
Merge "Set NetworkIdentity subscriberId on all networks" am: 1ded24221e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512877
Change-Id: I6ebe5b398a14c85fe32b1b497c381963377dcdbe
2020-12-04 03:18:57 +00:00
Treehugger Robot
ef8a605c6f
Merge "Remove NATT keepalive from IpSecTransform"
2020-12-04 02:07:56 +00:00
Remi NGUYEN VAN
533c8b181a
Merge "Remove hidden API usage in metrics toString" am: 179419f810 am: 9ae6c505e7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512876
Change-Id: I6c247fddeaa2aceb523d569bf00edafdcff145a1
2020-12-03 04:30:09 +00:00
Xin Li
39e9fc84f6
[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 9e27e114af -s ours
...
am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13120883
Change-Id: I72cd2486ff8473dcbdef76bc855e4fe45927b943
2020-12-03 04:25:31 +00:00
Remi NGUYEN VAN
9ae6c505e7
Merge "Remove hidden API usage in metrics toString" am: 179419f810
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512876
Change-Id: Ie5c89993c019770cdf71818565ed86f50fe9fcd1
2020-12-03 03:47:27 +00:00