LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,949 Commits 2 Branches 0 Tags
87ce7654bfc22f544c3b38dfd6a6d665ec491b51
Commit Graph

12949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Lorenzo Colitti
42f099f5c2 Merge "Improve getConnectionOwnerUid tests." am: bd2f639a30 am: aa7644c9f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82e9db5a466e6a40eaa92dfe45ed29447641d8e5
 2021-02-04 09:48:08 +00:00
Treehugger Robot
74126b9bb0 Merge "Revert the fallback naming into default network" am: 068b629dfe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ab54858d6b7f78a51fccb1c8dcfdf1983c572e
 2021-02-04 09:15:55 +00:00
Lorenzo Colitti
aa7644c9f9 Merge "Improve getConnectionOwnerUid tests." am: bd2f639a30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28b29f3acbc253e80bfe756ed67e48e4ce81af90
 2021-02-04 09:09:50 +00:00
Treehugger Robot
068b629dfe Merge "Revert the fallback naming into default network" 2021-02-04 08:48:21 +00:00
Lorenzo Colitti
bd2f639a30 Merge "Improve getConnectionOwnerUid tests." 2021-02-04 08:22:03 +00:00
Lucas Lin
15dc57287e Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: 0cbefc17d4 am: d6a7663703 am: 9cb2e8564b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ad30835e454c5003b36d0a87e0c34c88b2438bf
 2021-02-04 08:18:40 +00:00
TreeHugger Robot
89d4e71d73 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev am: 82c672dff6 -s ours am: 309742f110 -s ours 
am skip reason: Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 246d176689 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4300049cb11249c703f6f5c8fbcda5a14c569b5f
 2021-02-04 08:17:39 +00:00
Lucas Lin
9cb2e8564b Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: 0cbefc17d4 am: d6a7663703 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f337c1439d757dea60e91c8b182c3eb77633030
 2021-02-04 07:46:57 +00:00
TreeHugger Robot
309742f110 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev am: 82c672dff6 -s ours 
am skip reason: Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 246d176689 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I053b05625069920a308a0ec96cf34641644beffe
 2021-02-04 07:45:47 +00:00
Lucas Lin
d6a7663703 Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: 0cbefc17d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6774b8a1a029dbe34fe7aa8a4af3d94bdc0bb4
 2021-02-04 06:52:05 +00:00
Lucas Lin
0cbefc17d4 Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" 2021-02-04 06:12:14 +00:00
Lorenzo Colitti
dbcd5d632a Improve getConnectionOwnerUid tests. 
Currently, the tests only check whether the method throws a
SecurityException or not. Also check the return value of the
call, by mocking out InetDiagMessage.getConnectionOwnerUid.

This is required to test an upcoming change that will never
throw SecurityException but always return INVALID_UID if the
caller lacks permissions.

Bug: 173331190
Test: test-only change
Change-Id: I63f42a2f098fcf8796c9b4525a3a7b8320c0a139
 2021-02-04 04:19:28 +00:00
Chalard Jean
1bc77a99e3 Revert the fallback naming into default network 
There is strong opposition in the team to this rename.
Reverting to the old language.

Test: FrameworksNetTests
Change-Id: Icefa3090966c07fd66692ddd5b44dfc94485a914
 2021-02-04 13:14:05 +09:00
Remi NGUYEN VAN
6e722a0b4d Merge "Use formal API for ActivityThread to set proxy" into sc-dev 2021-02-04 02:44:38 +00:00
Lorenzo Colitti
b1014ac0e4 Merge changes Ifa2aa335,I09366a7f am: 7fed667205 am: 1700ac64d3 am: 61074fe878 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ac2a510eb5837acd77b2d7884da0af14cca502f
 2021-02-03 16:33:10 +00:00
Lorenzo Colitti
61074fe878 Merge changes Ifa2aa335,I09366a7f am: 7fed667205 am: 1700ac64d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75892e729ba690205bea14512edef97d271611f0
 2021-02-03 15:54:14 +00:00
Lorenzo Colitti
1700ac64d3 Merge changes Ifa2aa335,I09366a7f am: 7fed667205 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6a7c2ce8b46e448b3fa61c2ccc0050423521c52
 2021-02-03 15:25:38 +00:00
Lorenzo Colitti
567edf2911 Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: acdddac422 am: b13883951f am: 1a8680eb59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409cdb32c181fbd2397fbe2e2a1ff9437b755f40
 2021-02-03 15:03:37 +00:00
Lorenzo Colitti
1a8680eb59 Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: acdddac422 am: b13883951f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife8213b304f5645ed3f9f181576163aa7cec9f11
 2021-02-03 14:15:05 +00:00
Lorenzo Colitti
7fed667205 Merge changes Ifa2aa335,I09366a7f 
* changes:
  Allow setting underlying networks when legacy lockdown enabled.
  Allow passing the underlying network to startLegacyVpn.
 2021-02-03 14:07:44 +00:00
Lorenzo Colitti
b13883951f Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: acdddac422 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5aafc615748eb2f854afe04108ffa7bf6d1ff47b
 2021-02-03 13:32:46 +00:00
Lorenzo Colitti
acdddac422 Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" 2021-02-03 13:05:35 +00:00
Chalard Jean
a02d3f4256 Merge "[NS] Tests : don't expect a score in NF#acceptRequest" am: c6bf15898a am: 8b1998bfb2 am: 66ab10ca12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e2883453e20f09a269b99ccf8e3ec86b66964b
 2021-02-03 10:25:02 +00:00
Lorenzo Colitti
31f058e119 Allow setting underlying networks when legacy lockdown enabled. 
Currently, if a legacy lockdown VPN is up, no VPN can set
underlying networks. This does not make much sense.

When legacy lockdown VPN is enabled, no other VPN is allowed to
call prepare() or establish(), so no other VPN can connect, and
if no VPN can connect, then no VPN can set underlying networks.
Therefore, disabling the ability to set underlying networks only
affects the legacy lockdown VPN itself.

This change is necessary because in a future CL, the legacy
lockdown VPN will start to inform ConnectivityService of its
underlying network.

Bug: 173331190
Test: tests in subsequent CLs in stack
Change-Id: Ifa2aa3351c2c8324571f96fda151864ed987ed5a
 2021-02-03 19:04:17 +09:00