LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,974 Commits 2 Branches 0 Tags
7297b81489eaea53e1e6b5bc32e5f339e2dcd336
Commit Graph

12974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
7297b81489 Merge "[Mainline] Core Platform APIs migration" am: e205128f1f am: a774bdaacd am: cecb88898f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c34c147b6a60c7e6ae09b60d0378b6500ec7218
 2021-02-06 06:06:55 +00:00
Treehugger Robot
cecb88898f Merge "[Mainline] Core Platform APIs migration" am: e205128f1f am: a774bdaacd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9075b5338d14a939bedb13fcb57fe4ee527d990
 2021-02-06 05:40:14 +00:00
Treehugger Robot
a774bdaacd Merge "[Mainline] Core Platform APIs migration" am: e205128f1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0007ea53f7c4b4c1bbd0d397b848fb951278ec9
 2021-02-06 05:04:31 +00:00
Treehugger Robot
e205128f1f Merge "[Mainline] Core Platform APIs migration" 2021-02-06 04:11:00 +00:00
Aaron Huang
5b748de126 Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c am: 4bec1c714d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9188685fe0bb5ee7dfe2c0538fea6644b2cd642e
 2021-02-05 12:50:16 +00:00
Aaron Huang
4bec1c714d Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76d0e305bbace9c41a1ca44bad660391bbe79297
 2021-02-05 12:01:40 +00:00
Aaron Huang
1fb754cc9c Merge "Update VpnTest for new restricted API" am: 20507cf1f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47baf5985f00722b5be3402668cfe7ff4942e6d1
 2021-02-05 11:22:34 +00:00
Aaron Huang
20507cf1f9 Merge "Update VpnTest for new restricted API" 2021-02-05 10:52:54 +00:00
Treehugger Robot
9ebafad0d5 [automerger skipped] Merge "Add @Nullable to Object#equals()" am: 009f021811 am: 2a61f079a8 am: 7113304b38 -s ours 
am skip reason: Change-Id I5eedb571c9d78862115dfdc5dae1cf2a35343580 with SHA-1 e2b9459da9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie94057a64223064bd8b74af521ccc3c67f8e54d0
 2021-02-05 10:51:19 +00:00
Junyu Lai
277e5fb51e Merge "[VCN09] Rename linger timer" am: 5ae251610d am: 7604c69dff am: ea671ec39e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c7298e0fbc67e4461363f9371f496bf12f5c4c
 2021-02-05 10:50:58 +00:00
Remi NGUYEN VAN
02c343e23b Merge "Remove legacy network factories" am: e035041e55 am: a18ae04565 am: aee39eb58d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04893919701674bdaec026a14207bfb350a3cd08
 2021-02-05 10:50:14 +00:00
Treehugger Robot
7113304b38 Merge "Add @Nullable to Object#equals()" am: 009f021811 am: 2a61f079a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d13a249fabc93baaa0d01de3f9c6cec7ddd11e4
 2021-02-05 10:20:50 +00:00
Junyu Lai
ea671ec39e Merge "[VCN09] Rename linger timer" am: 5ae251610d am: 7604c69dff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2290180e6891e9f568140ecf9e79dd9b237e06bd
 2021-02-05 10:20:27 +00:00
Remi NGUYEN VAN
aee39eb58d Merge "Remove legacy network factories" am: e035041e55 am: a18ae04565 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If74d226cc09ea1f1b1a70423084fbd018dba2e63
 2021-02-05 10:20:00 +00:00
Treehugger Robot
2a61f079a8 Merge "Add @Nullable to Object#equals()" am: 009f021811 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I523eb00d30bfedeb6e7533a94868016171846a59
 2021-02-05 10:01:23 +00:00
Lorenzo Colitti
87ce7654bf Merge changes Ieb7f33bc,I81b56862 am: df7233f8e1 am: 92860eb233 am: 90cf1ed3f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie296e709b883fc2930b83dffbfb1366dd4a7e7e7
 2021-02-05 09:55:17 +00:00
Junyu Lai
7604c69dff Merge "[VCN09] Rename linger timer" am: 5ae251610d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b69d6ac4d273b836c5ce36c79fc3ebb6c964634
 2021-02-05 09:40:31 +00:00
Treehugger Robot
009f021811 Merge "Add @Nullable to Object#equals()" 2021-02-05 09:36:41 +00:00
Junyu Lai
5ae251610d Merge "[VCN09] Rename linger timer" 2021-02-05 09:29:12 +00:00
Remi NGUYEN VAN
a18ae04565 Merge "Remove legacy network factories" am: e035041e55 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I747f6352eb08589c00e77915eb17640e1d5f0ee1
 2021-02-05 09:23:44 +00:00
Lorenzo Colitti
90cf1ed3f7 Merge changes Ieb7f33bc,I81b56862 am: df7233f8e1 am: 92860eb233 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb68b5e1c2a3d653af675bae227bf8a5e3a4d72e
 2021-02-05 08:55:22 +00:00
Remi NGUYEN VAN
e035041e55 Merge "Remove legacy network factories" 2021-02-05 08:23:19 +00:00
Paul Hu
0b756aeb45 Merge "Replace NPMI#isUidNetworkingBlocked()" am: 9113cf2872 am: c48b6bb362 am: b3cd3bb875 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53f5fb0996ad08c8a44c0560ab72725c47e39215
 2021-02-05 08:15:29 +00:00
junyulai
2a4f006f30 [VCN09] Rename linger timer 
Linger timer mechanism will be used for both "linger" and
"nascent" states. To prevent confusion, rename the linger
timer and related functions to more generic name.

Test: TH
Bug: 175180558
Change-Id: I652f7c65c2f8bc58fb9d3316480f23a9709eccce
 2021-02-05 15:57:07 +08:00
Lorenzo Colitti
92860eb233 Merge changes Ieb7f33bc,I81b56862 am: df7233f8e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0ef06663c31dfe16e0000410c9785ede9369212
 2021-02-05 07:54:40 +00:00
Paul Hu
b3cd3bb875 Merge "Replace NPMI#isUidNetworkingBlocked()" am: 9113cf2872 am: c48b6bb362 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c9f22befc69af4b4dc796d7fb432314cf8e3c3f
 2021-02-05 07:43:12 +00:00
Lorenzo Colitti
df7233f8e1 Merge changes Ieb7f33bc,I81b56862 
* changes:
  Fix the legacy VPN tests that start racoon.
  Make testLegacyLockdownVpn more realistic.
 2021-02-05 07:34:43 +00:00
Roman Kalukiewicz
1f69a5e261 Add @Nullable to Object#equals() 
This is a partial cherry-pick of change:
I5eedb571c9d78862115dfdc5dae1cf2a35343580

for connectivity classes.

Bug: 170883422
Test: m
Merged-In: I5eedb571c9d78862115dfdc5dae1cf2a35343580
Change-Id: I7dc661863b73f4198ddb4f3a1566583d0f07db3c
 2021-02-05 07:28:44 +00:00
Paul Hu
c48b6bb362 Merge "Replace NPMI#isUidNetworkingBlocked()" am: 9113cf2872 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c4b745fa67c8db72d04eb48582d06916f58902d
 2021-02-05 07:01:42 +00:00
Paul Hu
9113cf2872 Merge "Replace NPMI#isUidNetworkingBlocked()" 2021-02-05 06:38:02 +00:00
Lorenzo Colitti
f5a4ac9592 Fix the legacy VPN tests that start racoon. 
These tests do not actually work, or at least not as designed.
What happens when they are run is that creating/connecting the
VPN throws an exception. The call to legacyRunnerReady.block()
times out after 10 seconds because the condition variable is
never opened, but the doesn't notice the timeout becasue it
doesn't check the return value of block().

There are two reasons for the VPN not coming up.
1. VpnConfig.getIntentForStatusPanel calls into PendingIntent and
   ActivityManager statics, which bypass all the mocks and fail
   with an appops denial. Fix this by making it a dependency.
2. The tests are broken due to the UserManager API changes
   tracked in b/175883995. Fixing by adding a bit of ad-hoc code
   into startLegacyVpn, with a TODO to delete it once the rest of
   the UserManager setup code is fixed.

Fix these and check the return value of block(). This ensures
that if any other breakage is added the test will actually fail.
Also check that the throw route survives all the way to the
LinkProperties sent to the agent.

Bug: 173331190
Test: atest com.android.server.connectivity.VpnTest
Change-Id: Ieb7f33bce283ac5ee562a912df8edb9c930ed2b0
 2021-02-05 14:40:13 +09:00
Lorenzo Colitti
3a2a0a31f4 Make testLegacyLockdownVpn more realistic. 
Bug: 173331190
Test: test-only change
Change-Id: I81b5686244f479d967c826e29eba4feb396a09cf
 2021-02-05 14:36:54 +09:00
James Mattis
6891366049 Merge changes Ic41fdc40,I5851a36e am: 34989a9c9e am: f6689c9541 am: 1d21632a3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc7fa53e74c2c4af89df02f1610105f1e62d06c4
 2021-02-05 05:02:20 +00:00
James Mattis
1d21632a3a Merge changes Ic41fdc40,I5851a36e am: 34989a9c9e am: f6689c9541 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d16914403745fe0a1421423667ad3a7cd00a4e5
 2021-02-05 04:36:08 +00:00
James Mattis
f6689c9541 Merge changes Ic41fdc40,I5851a36e am: 34989a9c9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id949051a7aa834be339530f5db6cdd36ec2ea7f2
 2021-02-05 03:49:50 +00:00
James Mattis
f61f7be217 Updating Existing CS APIs for multiple defaults 
Updating existing ConnectivityService APIs to support multiple default
network functionality.

Bug: 178729499
Bug: 172347841
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Ic41fdc402a26809efda71f484c259ffd7a52e63b
 2021-02-04 15:54:18 -08:00
James Mattis
1238af2a5c Transmitting multiple default networks to netd 
Updating ConnectivityService to transmit network information to netd as
part of supporting multiple default networks.

Bug: 176191930
Bug: 172347841
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I5851a36e3c3ccb45f4cb3ff85e0fc1352f64dc70
 2021-02-04 15:41:25 -08:00
Serik Beketayev
e5e58d195b [Mainline] Core Platform APIs migration 
* java/net/InetAddress;->parseNumericAddress(Ljava/lang/String;)Ljava/net/InetAddress;
* libcore/io/IoUtils;->closeQuietly(Ljava/io/FileDescriptor;)V
* libcore/io/IoUtils;->closeQuietly(Ljava/lang/AutoCloseable;)V
* libcore/io/IoUtils;->setBlocking(Ljava/io/FileDescriptor;Z)V
* java/net/Inet4Address;->ANY:Ljava/net/InetAddress;
* java/net/Inet6Address;->ANY:Ljava/net/InetAddress;

Bug: 177260833
Test: mma
Change-Id: Iaddf1e9d912208b3982faea90aaa0fda80d9420a
 2021-02-04 15:38:24 -08:00
Adrian Roos
c95b4ad078 [automerger skipped] Merge changes from topic "nullablecollection" am: 0a5c421c92 am: 43e0944217 am: db20faabe8 -s ours 
am skip reason: Change-Id I5ce70d3e622fcdd13d63d47bf483507378a60e16 with SHA-1 c042e7c643 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3cca4dfc5d551377307b4393ca8e2b3aa06318c
 2021-02-04 17:10:01 +00:00
Adrian Roos
6aea75553a API: Suppress existing NullableCollections lints am: 14c08d26d5 am: 015da1beca am: 47136c15e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314b97d2677f26b0a9c09a52918df49096450aea
 2021-02-04 17:09:38 +00:00
Adrian Roos
db20faabe8 Merge changes from topic "nullablecollection" am: 0a5c421c92 am: 43e0944217 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6baaacb15e7575f837da727ecbe6643dd93dfb4
 2021-02-04 16:49:05 +00:00
Adrian Roos
47136c15e6 API: Suppress existing NullableCollections lints am: 14c08d26d5 am: 015da1beca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I931b4ec091173789f480ecc761044a27944c4b85
 2021-02-04 16:49:00 +00:00
Adrian Roos
43e0944217 Merge changes from topic "nullablecollection" am: 0a5c421c92 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I754de2bd3b24e9027d6cf9776ea93e611a8e42c7
 2021-02-04 16:23:43 +00:00
Adrian Roos
015da1beca API: Suppress existing NullableCollections lints am: 14c08d26d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d47151b7e26e82706f2d94a13c4067fe71fc168
 2021-02-04 16:19:34 +00:00
Adrian Roos
0a5c421c92 Merge changes from topic "nullablecollection" 
* changes:
  API: Suppress existing NullableCollections lints (TaskOrganizer)
  API: Suppress existing NullableCollections lints
 2021-02-04 15:53:34 +00:00
paulhu
97114c99b4 Replace NPMI#isUidNetworkingBlocked() 
ConnectivityService is going to become a mainline module which
will not able to access hidden APIs. NetworkPolicyManagerInternal
is a internal serivce that CS can't be access after be a mainline
module. Thus, create NPM#checkUidNetworkingBlocked to replace it.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Test: atest CtsHostsideNetworkTests
Test: atest FrameworksCoreTests:NetworkPolicyManagerTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest
Change-Id: I7bee37522dc5c55c255b159fda9481eff663655a
 2021-02-04 19:28:57 +08:00
Aaron Huang
a8a74f1988 Update VpnTest for new restricted API 
This patch addressses the mocked UserManager for the context
of the user which is created by createContextAsUser.

Bug: 171529940
Bug: 175883995
Test: FrameworksNetTests
Change-Id: Ie72d08c765ed7fb7083c0c4b7ee02a43c23d1707
 2021-02-04 19:14:57 +08:00
Treehugger Robot
a9c77e909e Merge "Revert the fallback naming into default network" am: 068b629dfe am: 74126b9bb0 am: 4e42931c64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I697cbceff12a2cdc2aa7c36bcfbf4ea28f68ab82
 2021-02-04 10:12:01 +00:00
Lorenzo Colitti
02e6ba7210 Merge "Improve getConnectionOwnerUid tests." am: bd2f639a30 am: aa7644c9f9 am: 42f099f5c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie69cc409c24468aaebb4a0267009bdc4f9b7a622
 2021-02-04 10:11:21 +00:00
Treehugger Robot
4e42931c64 Merge "Revert the fallback naming into default network" am: 068b629dfe am: 74126b9bb0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifde71b5b364c03fde902021ad7371d139677fdb1
 2021-02-04 09:48:16 +00:00