Paul Hu
fb32206f12
Merge "Replace InetAddress#parseNumericAddress" am: 2622bfd00a am: 70f311507c am: 8df091c115
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6f19204d54688ea6af69d503c6dae441ff7afce
2021-03-15 08:26:28 +00:00
Remi NGUYEN VAN
90efff4cf0
Merge "Remove connectivity dependency on Preconditions" am: 00e1d9ee70 am: 18925df41b am: 4879735886
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia618516b1cd0096b9550dea38703bde3692915cf
2021-03-15 08:25:36 +00:00
Paul Hu
70f311507c
Merge "Replace InetAddress#parseNumericAddress" am: 2622bfd00a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f1112eef6086798a6f089dde2f297828c0b4f2e
2021-03-15 07:06:12 +00:00
Paul Hu
2622bfd00a
Merge "Replace InetAddress#parseNumericAddress"
2021-03-15 07:03:46 +00:00
Remi NGUYEN VAN
18925df41b
Merge "Remove connectivity dependency on Preconditions" am: 00e1d9ee70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c0c2572ff84a2b163fb2e4e0f3e2cfec043313d
2021-03-15 07:03:36 +00:00
Remi NGUYEN VAN
00e1d9ee70
Merge "Remove connectivity dependency on Preconditions"
2021-03-15 06:36:15 +00:00
Remi NGUYEN VAN
228cd067db
Merge "Remove VpnType usage in VpnTransportInfo" am: 8828fc0b65 am: 59ad107b0f am: 2fb1c6649c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2c66e0c97bc383237782f6116398b225c26e3ea
2021-03-15 03:30:53 +00:00
Remi NGUYEN VAN
d28bca135c
[automerger skipped] Merge "Create a service-connectivity-pre-jarjar library" am: 5d3948005d am: a239a8e669 am: d4d657d80b -s ours
...
am skip reason: Change-Id I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca with SHA-1 bc736ce82f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8606cfd56baed07c87dc7ae4ba0eb7292d57a72d
2021-03-15 03:30:35 +00:00
Remi NGUYEN VAN
59ad107b0f
Merge "Remove VpnType usage in VpnTransportInfo" am: 8828fc0b65
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41431bfba97a6fe0678b9a5dc72b19479d5d4c66
2021-03-15 02:07:39 +00:00
Remi NGUYEN VAN
a239a8e669
Merge "Create a service-connectivity-pre-jarjar library" am: 5d3948005d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17ca508f3da731404306d6e65e9743120a7e0860
2021-03-15 02:05:41 +00:00
Remi NGUYEN VAN
8828fc0b65
Merge "Remove VpnType usage in VpnTransportInfo"
2021-03-15 01:52:30 +00:00
Remi NGUYEN VAN
5d3948005d
Merge "Create a service-connectivity-pre-jarjar library"
2021-03-15 01:32:47 +00:00
Lucas Lin
28f6ce21af
Merge "Have a new API to get private DNS mode" into sc-dev
2021-03-15 01:00:25 +00:00
paulhu
0494b85ffb
Replace InetAddress#parseNumericAddress
...
-Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
non-formal API InetAddress#parseNumericAddress to
InetAddresses#parseNumericAddress.
- Add deprecated method legacyParseIpAndMask() for IpPrefix and
LinkAddress. Because InetAddresses#parseNumericAddress has
a little different behavior in some case, but these two classes
should keep working as before. So these two classes will use
the new deprecated method.
Bug: 181756157
Test: FrameworksNetTests
Change-Id: I1c96b75f0b8d5e93304a39b4a8c8849964e5e810
2021-03-12 19:57:40 +08:00
Remi NGUYEN VAN
65bf3af20b
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e9e7dce89 am: ba744b34b8 am: afcdfff9c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8b76d3c6e18c2c38d86c5c4bd5a75b6a02437a4
2021-03-12 10:45:30 +00:00
Treehugger Robot
5bcce41201
Merge "Remove hidden @NetworkType in NetworkInfo" am: e01042965a am: 19feee80d0 am: b618bb7728
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4868ba91efd24c4544dc6ce044e1b76d50c1a611
2021-03-12 10:45:09 +00:00
Treehugger Robot
335d43f06e
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: de66768a6c am: 21c40a1905 am: 2e5256b1a2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibfe6a57de8deb33fc4a63acdf0ea264d5e506883
2021-03-12 10:44:34 +00:00
Treehugger Robot
b85b9d04f0
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: c899c4fee6 am: 3a146b660e am: bb09bdec94
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I446cca57e6841c923ea89ce8f8eddfd1b8e60b79
2021-03-12 10:43:59 +00:00
Remi NGUYEN VAN
ba744b34b8
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e9e7dce89
...
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
Remi NGUYEN VAN
9b47fcca83
Remove VpnType usage in VpnTransportInfo
...
The VpnType annotation is a hidden symbol, and should be
kept hidden as annotations are disallowed by API guidelines.
Remove its usage in VpnTransportInfo as users of annotated constants
that build against API stubs are expected not to use the annotation.
Bug: 173331190
Test: m
Change-Id: I171fa57f6279defad081c3cd16265d58ec55e57d
2021-03-12 18:30:30 +09:00
Treehugger Robot
19feee80d0
Merge "Remove hidden @NetworkType in NetworkInfo" am: e01042965a
...
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
21c40a1905
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: de66768a6c
...
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
3a146b660e
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: c899c4fee6
...
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
Junyu Lai
c3b7651a0b
Merge changes from topics "vcn04", "vcn12" am: 992f747392 am: 4c60c95d3c am: f263dba043
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3db655c53a855fe418ba5c6fd8230622805966d5
2021-03-12 09:07:00 +00:00
Remi NGUYEN VAN
7e9e7dce89
Merge "Remove usage of hidden InetSocketAddress constructor"
2021-03-12 09:02:15 +00:00
Treehugger Robot
e01042965a
Merge "Remove hidden @NetworkType in NetworkInfo"
2021-03-12 08:59:35 +00:00
Treehugger Robot
de66768a6c
Merge "Remove hidden INVALID_RESOURCE_ID in unused param"
2021-03-12 08:57:55 +00:00
Treehugger Robot
c899c4fee6
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor"
2021-03-12 08:57:47 +00:00
lucaslin
180f44f0f2
Have a new API to get private DNS mode
...
- Expose PRIVATE_DNS_MODE_OFF, PRIVATE_DNS_MODE_OPPORTUNISTIC and
PRIVATE_DNS_MODE_PROVIDER_HOSTNAME for external users.
- Since PRIVATE_DNS_DEFAULT_MODE_FALLBACK might be changed from
release to release, so it cannot be exposed as a system API.
Remove PRIVATE_DNS_DEFAULT_MODE_FALLBACK and have a new API -
getPrivateDnsMode() for users to get the private DNS mode instead.
Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCases
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Change-Id: I02a1e91b4eafb5f5df3eada1c07b99849a050c3c
2021-03-12 16:11:27 +08:00
Junyu Lai
4c60c95d3c
Merge changes from topics "vcn04", "vcn12" am: 992f747392
...
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
992f747392
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
926fb37c83
Merge "ConnectivityManager: Provide API's to include location sensitive info" am: a03f3bbf0e am: e0e069d4cf am: 0659f32f4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf60935623b62e29cb2ba52b4de554c7f0d78ef1
2021-03-12 07:12:03 +00:00
Treehugger Robot
c69d5f1255
Merge "Remove Slog usage in NetworkState" am: 18cc3dc34f am: c3d9db6ed9 am: 1c38988a79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0345579ab38ffd06dc548d7c268f1e2dff2c7b9d
2021-03-12 06:13:59 +00:00
Remi NGUYEN VAN
c6f0e0a928
Merge "Move ParseException to Connectivity" am: 24162a26ff am: f80b769f4e am: 7ef2e6d731
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba0c91e109d04be28dca01c1997e74c06f12f60f
2021-03-12 06:13:12 +00:00
Roshan Pius
e0e069d4cf
Merge "ConnectivityManager: Provide API's to include location sensitive info" am: a03f3bbf0e
...
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
a03f3bbf0e
Merge "ConnectivityManager: Provide API's to include location sensitive info"
2021-03-12 05:56:29 +00:00
Treehugger Robot
c3d9db6ed9
Merge "Remove Slog usage in NetworkState" am: 18cc3dc34f
...
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
f80b769f4e
Merge "Move ParseException to Connectivity" am: 24162a26ff
...
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
18cc3dc34f
Merge "Remove Slog usage in NetworkState"
2021-03-12 05:12:26 +00:00
Lucas Lin
fecca448ba
Merge changes Ib80f814f,Ic605e489 am: 3ef74f3cab am: ca62593ba7 am: 7b190776ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f
2021-03-12 04:58:40 +00:00
Remi NGUYEN VAN
24162a26ff
Merge "Move ParseException to Connectivity"
2021-03-12 04:27:55 +00:00
Lucas Lin
ca62593ba7
Merge changes Ib80f814f,Ic605e489 am: 3ef74f3cab
...
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
Lucas Lin
3ef74f3cab
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
Roshan Pius
e08bc1803c
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
5754ef36e9
Merge "Create ServiceConnectivityResources" into sc-dev
2021-03-12 02:10:20 +00:00
Remi NGUYEN VAN
88cbbdc86d
[automerger skipped] Merge changes from topic "ethernet_specifier" am: de3d545cf1 am: 17ad9338bc am: 1764ceaa67 -s ours
...
am skip reason: Change-Id Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989 with SHA-1 4e5222b9da is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0133b6f49eac269c5704e5a1dbdfecc85507ae32
2021-03-12 00:52:26 +00:00
Remi NGUYEN VAN
08a047c814
[automerger skipped] Add Ethernet, TestNetworkSpecifier API am: ea33ac97f6 am: 40fe7c287b am: 734c56f7a9 -s ours
...
am skip reason: Change-Id Iee569f5c8bbdc4bc979610e1191308281f3d4620 with SHA-1 32288186bb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4f60a26f8c19e77d348dfcc7c382022ba6cf0d1
2021-03-12 00:52:15 +00:00
Treehugger Robot
77f80a6743
Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: de1cef76d7 am: bec7ce5cf4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1b3f0447705f910467a52d2504ba1aaef850a80
2021-03-12 00:49:24 +00:00
Remi NGUYEN VAN
17ad9338bc
Merge changes from topic "ethernet_specifier" am: de3d545cf1
...
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
40fe7c287b
Add Ethernet, TestNetworkSpecifier API am: ea33ac97f6
...
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