Remi NGUYEN VAN
c3a9529c58
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e8db8aed8 am: b392e8ffa6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If44709876c213ef752b1dc94ea64f5b4690ff42f
2021-03-12 10:00:57 +00:00
Treehugger Robot
a9a58051fd
Merge "Remove hidden @NetworkType in NetworkInfo" am: f829e86db8 am: 2e28bfa25b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I888dc544595c7b5b085ea70e609cacdd6c526591
2021-03-12 10:00:39 +00:00
Treehugger Robot
570a192f35
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 31558edb8e am: 3fef231b42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I24c665e10814ddf46005fa84ea12cbd4e4e22369
2021-03-12 10:00:28 +00:00
Treehugger Robot
3327d66cc8
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4 am: 43b1fa710e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I890d00fa46d9623bc7d391379ac9b77b7f33703d
2021-03-12 10:00:17 +00:00
Remi NGUYEN VAN
b392e8ffa6
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e8db8aed8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e2bc5128658973dc873aa3f6eb41593d8d9a308
2021-03-12 09:30:30 +00:00
Treehugger Robot
2e28bfa25b
Merge "Remove hidden @NetworkType in NetworkInfo" am: f829e86db8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8cdd5f7eec86f8bc882f70dbc7480a0c0669358
2021-03-12 09:27:20 +00:00
Treehugger Robot
3fef231b42
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 31558edb8e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida08886109393bc8255de1eec64d5f0a45970eba
2021-03-12 09:24:09 +00:00
Treehugger Robot
43b1fa710e
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b3e8b098eb80098198b1e1cf6c2ce2fe138bc0a
2021-03-12 09:22:33 +00:00
Remi NGUYEN VAN
7e8db8aed8
Merge "Remove usage of hidden InetSocketAddress constructor"
2021-03-12 09:02:15 +00:00
Treehugger Robot
f829e86db8
Merge "Remove hidden @NetworkType in NetworkInfo"
2021-03-12 08:59:35 +00:00
Treehugger Robot
31558edb8e
Merge "Remove hidden INVALID_RESOURCE_ID in unused param"
2021-03-12 08:57:55 +00:00
Treehugger Robot
0a30c831a4
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor"
2021-03-12 08:57:47 +00:00
Junyu Lai
ed8aca675d
Merge changes from topics "vcn04", "vcn12" am: d219f4807c am: 10af6fb500
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae13465b19d5245782cded0d01ff1b39617c8ac8
2021-03-12 08:24:46 +00:00
Junyu Lai
10af6fb500
Merge changes from topics "vcn04", "vcn12" am: d219f4807c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If14f8b2c89483095f22a2b1bc77b0d76cdcb8366
2021-03-12 07:50:50 +00:00
Junyu Lai
d219f4807c
Merge changes from topics "vcn04", "vcn12"
...
* changes:
[VCN12] Expose setSubIds/getSubIds APIs
[VCN04] Add Subscription Id set into NetworkCapabilities
2021-03-12 07:12:59 +00:00
Roshan Pius
6519ca6217
Merge "ConnectivityManager: Provide API's to include location sensitive info" am: f72f1d9e28 am: 312bcb6871
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47515a4c38e96f6e1caa8ceb50e6b83de8c3ec35
2021-03-12 06:30:45 +00:00
Paul Hu
cad9f72e91
Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 2269d7e3fa am: d5eb1fad4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3cc5b5a8d6ae737f75f9c1cf17f7113bed663613
2021-03-12 06:30:34 +00:00
Roshan Pius
312bcb6871
Merge "ConnectivityManager: Provide API's to include location sensitive info" am: f72f1d9e28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf358f0532023ab990dea0ad958eacaa441e107c
2021-03-12 05:58:11 +00:00
Roshan Pius
f72f1d9e28
Merge "ConnectivityManager: Provide API's to include location sensitive info"
2021-03-12 05:56:29 +00:00
Paul Hu
d5eb1fad4d
Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 2269d7e3fa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I61c84ce1b8e1a9ccdb8fd1581bf0c3906db943f3
2021-03-12 05:51:23 +00:00
Treehugger Robot
fc8d0f981f
Merge "Remove Slog usage in NetworkState" am: 437ee783c4 am: 15516e3f0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14f13eefd5a1649df8eb3b3f77bfda45997b26de
2021-03-12 05:32:55 +00:00
Remi NGUYEN VAN
6a30b70575
Merge "Move ParseException to Connectivity" am: eae251b42a am: 160a29cad8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb5674e812f2a2f2a6a1e23aa46a2d8f208099f5
2021-03-12 05:32:43 +00:00
Paul Hu
2269d7e3fa
Merge "Stop using PackageManagerInternal in PermissionMonitor"
2021-03-12 05:23:05 +00:00
Treehugger Robot
15516e3f0b
Merge "Remove Slog usage in NetworkState" am: 437ee783c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e01b140db4d44de081ba4d87cca63578271500e
2021-03-12 05:15:42 +00:00
Remi NGUYEN VAN
160a29cad8
Merge "Move ParseException to Connectivity" am: eae251b42a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06ac628c283c0a59a756fb5d6e94afb5aef949dd
2021-03-12 05:12:33 +00:00
Treehugger Robot
437ee783c4
Merge "Remove Slog usage in NetworkState"
2021-03-12 05:12:26 +00:00
Lucas Lin
9038eeece3
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41 am: 3912538c41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f41a9cd27dd37c859e69fe02a32b9ab13fb0d46
2021-03-12 04:34:22 +00:00
Frank Li
ac99b3fd18
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31 am: 22f91bdbca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic6aa11902b9ade040bee702650722edfd65b9113
2021-03-12 04:34:11 +00:00
Remi NGUYEN VAN
eae251b42a
Merge "Move ParseException to Connectivity"
2021-03-12 04:27:55 +00:00
Lucas Lin
3912538c41
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94fd187e5f2cc0428807668f82b3a29ad8b66c47
2021-03-12 03:56:18 +00:00
Frank Li
22f91bdbca
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9096f951a18b1ffe96efa1d48207dac644d4e92c
2021-03-12 03:52:27 +00:00
Lucas Lin
3bde652e41
Merge changes Ib80f814f,Ic605e489
...
* changes:
Use new API - getIpSecNetIdRange() in IpSecService
Add a new API to get the network ID range of IPSec tunnel interface
2021-03-12 03:30:32 +00:00
Frank Li
ab31bd8c31
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService"
2021-03-12 02:45:30 +00:00
Roshan Pius
7992afdcc3
ConnectivityManager: Provide API's to include location sensitive info
...
Existing NetworkCallback users will get NetworkCapabilities with
location sensitive data removed (except for ownerUid which will be
added for existing apps for backwards compatibility). Apps
have to opt-in to receive location sensitive data.
Note: This was chosen because WifiInfo is the only TransportInfo tha
has location sensitive info & that was added only in Android 12. If we
choose to default to true, all existings apps retrieving
NetworkCapabilities for wifi networks will be blamed for location access
unnecessarily.
Changes:
i) Add a flag in NetworkCallback creation to retrieve
NetworkCapabilities with location sensitive info in their callback.
(More flags are being planned for NetworkCallback for throttling
callback frequency, etc)
ii) For NetworkCapabilities.getOwnerUid(), we will continue to send the
data for apps targeting older SDK (since this is an existing field and
the new flag defaults location sensitive data to off).
Bug: 156867433
Test: atest android.net
Test: atest com.android.server
Change-Id: If70b5ea6f5c8885f0c353c8df08a826d55fe7f7a
2021-03-11 18:27:18 -08:00
Remi NGUYEN VAN
d4232ce11a
Merge changes from topic "ethernet_specifier" am: 92e9f17915 am: 7af6af880c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I772ca29f64cb9431a899a2c213c511ad467fc36f
2021-03-12 00:26:49 +00:00
Remi NGUYEN VAN
f9799d63a4
Add Ethernet, TestNetworkSpecifier API am: 7f11b46a43 am: f680bb763a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63159846579c43c721eeb86c9a55faa3f2888be8
2021-03-12 00:26:45 +00:00
Remi NGUYEN VAN
7af6af880c
Merge changes from topic "ethernet_specifier" am: 92e9f17915
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1
2021-03-12 00:12:52 +00:00
Remi NGUYEN VAN
f680bb763a
Add Ethernet, TestNetworkSpecifier API am: 7f11b46a43
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
2021-03-12 00:10:08 +00:00
Treehugger Robot
431f25a9da
Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 007256389e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0742b4bb3c5b2ddaa06830b403d849ed25ef71cd
2021-03-12 00:04:56 +00:00
Remi NGUYEN VAN
92e9f17915
Merge changes from topic "ethernet_specifier"
...
* changes:
Fix common tests on Q and R
Add Ethernet, TestNetworkSpecifier API
2021-03-11 23:51:49 +00:00
Treehugger Robot
007256389e
Merge changes Iac9487e8,Ifa411c7b am: 999506022f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2cf126259f903d407830b1e8bc2d3fcdc02b97c2
2021-03-11 23:15:17 +00:00
lucaslin
1a6095c4cf
Add a new API to get the network ID range of IPSec tunnel interface
...
- Add a new API to get the network ID range of IPSec tunnel
interface.
- Use the new API in IpSecServiceTest to make sure the result is
the same. Follow-up commit will change the logic in
IpSecService#reserveNetId(), the modified test can ensure the
correctness of the new change.
Bug: 172183305
Test: atest FrameworksNetTests:IpSecServiceTest
Change-Id: Ic605e48941fc9d6482cdcd01a8adcdc9b6d586a6
2021-03-12 00:46:33 +08:00
junyulai
26d680973f
[VCN12] Expose setSubIds/getSubIds APIs
...
Test: atest NetworkCapabilitiesTest
Bug: 175662146
Change-Id: Ia4b98bc6c5fcefee44233f3b7fbb6517a0e8870e
2021-03-11 23:03:19 +08:00
junyulai
f3ca0ef14c
[VCN04] Add Subscription Id set into NetworkCapabilities
...
This is a generic way to request networks that has different
subId but belongs to the same carrier. For example, cellular
networks with different SIM card, or carrier Wifi that
provided by the operator.
Test: atest NetworkCapabilitiesTest#testSubIds
Test: m doc-comment-check-docs -j
Test: atest CtsNetTestCases
Bug: 175662146
Change-Id: Ifca766f5acc73c285948d6251ec31506d9bb0bcb
2021-03-11 23:03:05 +08:00
Remi NGUYEN VAN
7f11b46a43
Add Ethernet, TestNetworkSpecifier API
...
Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only
production user), and make it module-lib API.
The original StringNetworkSpecifier file is actually kept to satisfy
some invalid dependencies; it will be removed separately.
This allows specifying an Ethernet interface with a non-deprecated API:
until this change the only way to do so would be to use
NetworkRequest#setSpecifier(String), which is deprecated.
Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to
replace previous usage of StringNetworkSpecifier. TestNetworkManager is
module API, so TestNetworkSpecifier should be module API too. This
allows tests to request the test interface specifically, without using
the deprecated NetworkRequest#setSpecifier(String).
Bug: 179329291
Test: m
Merged-In: Iee569f5c8bbdc4bc979610e1191308281f3d4620
Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
2021-03-11 23:02:02 +08:00
Remi NGUYEN VAN
5a6212753b
Fix common tests on Q and R
...
The common tests cannot reference EthernetNetworkSpecifier,
as it did not exist in Q and R yet.
Bug: 179329291
Merged-In: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Change-Id: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Test: atest CtsNetTestCasesLatestSdk
2021-03-11 23:02:02 +08:00
junyulai
f4bc12fe28
[VCN11] Make requestBackgroundNetwork requires handler
...
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest
Bug: 175662146
Change-Id: Iac9487e8de8bfdd87fc7a0153b228ae2a7ba4e19
2021-03-11 21:05:27 +08:00
junyulai
6b0a6a22a3
[VCN10] Add new API to listen for highest score network
...
Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback
Bug: 175662146
Change-Id: Ifa411c7b53da789c74fff7e1a95f9c9ebf5bd05c
2021-03-11 21:04:06 +08:00
Lorenzo Colitti
5d6c73b585
Merge "Don't start clatd if disabled by vendor property." am: 91fccfe42f am: 6abc4bec40
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I333fba0c9bca40f0cd60d042b4c6ed82e72abaa9
2021-03-11 12:55:46 +00:00
Lorenzo Colitti
6abc4bec40
Merge "Don't start clatd if disabled by vendor property." am: 91fccfe42f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e468f41424104a5e1d757e18bc5a8648c7f6d1d
2021-03-11 12:34:57 +00:00