LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,668 Commits 2 Branches 0 Tags
12703ee175b773fcdf77eeafad88557d4738208f
Commit Graph

12668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyu Lai
12703ee175 Merge "Revert "[VCN06] Support request background network"" am: 2fa034c812 am: b7b3064394 am: dd7029fd30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I896c2008e29163527b03f031623e1c70d16e1da4
 2021-01-19 12:39:27 +00:00
Junyu Lai
dd7029fd30 Merge "Revert "[VCN06] Support request background network"" am: 2fa034c812 am: b7b3064394 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81c094b08398d55a0ada21af60c22dfe7ec9cd97
 2021-01-19 11:59:36 +00:00
Junyu Lai
b7b3064394 Merge "Revert "[VCN06] Support request background network"" am: 2fa034c812 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8f292997e582da1eeeb469c91a52225ba4a2217
 2021-01-19 11:34:18 +00:00
Junyu Lai
2fa034c812 Merge "Revert "[VCN06] Support request background network"" 2021-01-19 10:24:47 +00:00
Junyu Lai
34263da2c9 Revert "[VCN06] Support request background network" 
Revert submission 1545847-vcn06

Reason for revert: b/177876289 presubmit failure
Reverted Changes:
I8042ce197:[VCN06.1] Add CTS for request background network
If9aaa87b7:[VCN06] Support request background network

Change-Id: I9270b02a2d6d1ffcdd83b4f41becaf09a2b91e0a
 2021-01-19 09:06:00 +00:00
Treehugger Robot
6eba3e4554 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: d806079674 am: 92884ae4ce am: 43522bd797 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e3e891f2104c3363b7e6eb46c12486a76f93d50
 2021-01-19 05:46:41 +00:00
Treehugger Robot
b19d0ca85d Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 4fcb0e54a1 am: ed9f5d54a5 am: 0cc2e20cc9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7c2c6289bcc469f43f0293ca4bfd7d6b15ce80a
 2021-01-19 05:46:03 +00:00
Treehugger Robot
43522bd797 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: d806079674 am: 92884ae4ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib62b14620dd2aa880bca086d7144b05e088d236d
 2021-01-19 05:23:31 +00:00
Treehugger Robot
0cc2e20cc9 Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 4fcb0e54a1 am: ed9f5d54a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I003a453f17b37f10e2acd4c92aa56fe52c09741f
 2021-01-19 05:22:18 +00:00
Treehugger Robot
92884ae4ce Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: d806079674 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74a6492618ca1e21e35474c012dee9886239e75a
 2021-01-19 04:49:10 +00:00
Treehugger Robot
d806079674 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" 2021-01-19 04:45:08 +00:00
Treehugger Robot
ed9f5d54a5 Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 4fcb0e54a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cf8401a1cf16b8bbd3d46a65c40c642324c00e8
 2021-01-19 04:45:06 +00:00
Treehugger Robot
4fcb0e54a1 Merge changes I475502fd,Ibf376a6f,Ia52f9caf 
* changes:
  Address comments on aosp/1539753, aosp/1542487 and aosp/1547496.
  Fix propagating underlying caps when a network disconnects.
  Test for bugs with suspended VPN underlying networks.
 2021-01-19 04:19:56 +00:00
Remi NGUYEN VAN
da94136cc7 Fix CaptivePortalDataTest#testParcelUnparcel on R 
CaptivePortalData only has 7 fields on R, not 8.

Bug: 177290955
Change-Id: I156738d07821fee43420d8af14c4bce36dd0e4a4
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest on R
 2021-01-19 02:33:09 +00:00
Junyu Lai
635c79aeff Merge "[VCN06] Support request background network" am: 95f0791724 am: bf098917d8 am: d57038a8b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12d2cbe4a5fc10a7ec7abf8038c088fe13b02d59
 2021-01-19 01:50:31 +00:00
Lorenzo Colitti
34007bd8de Address comments on aosp/1539753, aosp/1542487 and aosp/1547496. 
Bug: 173331190
Test: test-only change
Change-Id: I475502fde55d24e7ae3f7fe9f43c54740c57a9cf
 2021-01-19 10:35:43 +09:00
Junyu Lai
d57038a8b0 Merge "[VCN06] Support request background network" am: 95f0791724 am: bf098917d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic810d591fcb5895db877fdd5634f9adca6a7720f
 2021-01-19 01:34:53 +00:00
Junyu Lai
bf098917d8 Merge "[VCN06] Support request background network" am: 95f0791724 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a090a26f0f14317622de9f1971701855723fb56
 2021-01-19 01:12:58 +00:00
Junyu Lai
95f0791724 Merge "[VCN06] Support request background network" 2021-01-19 01:04:20 +00:00
Lorenzo Colitti
c284b4b8dd Fix propagating underlying caps when a network disconnects. 
aosp/1513052, which generalized support for underlying networks,
broke default network switching when the network underlying a VPN
disconnects.

This is because it calls propagateUnderlyingNetworkCapabilities
in the middle of the bookkeeping operations needed when a
network is disconnected (specifically, after all satisified
requests are removed from the disconnecting network, but before
mDefaultNetworkNai is updated). This is completely incorrect
because propagateUnderlyingNetworkCapabilities can trigger a
network rematch, and running a rematch when the request data
structures are inconsistent is obviously wrong. See the test
changes in this CL for an example of the damage.

Fix this by moving propagateUnderlyingNetworkCapabilities to
before the bookeeping operations begin. It must be before
mDefaultNetworkNai is updated, because otherwise it will not know
that the default network is disconnecting, and it will not be
able to propagate capabilities to VPNs that set underlying
networks to null (i.e., to the default network). It must be
after the nai is removed from mNetworkForNetId because
otherwise it will think that the underlying network is still
connected.

Bug: 173331190
Test: accompanying unit test shows lots of bugs removed
Change-Id: Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272
 2021-01-19 09:40:53 +09:00
Lorenzo Colitti
dbf549c1c7 Test for bugs with suspended VPN underlying networks. 
Test: atest --rerun-until-failure 100 ConnectivityServiceTest#testVpnSwitchFromSuspendedToNonSuspended
Change-Id: Ia52f9cafef3f49ae70ad135d017e207eb57fddfe
 2021-01-19 00:42:46 +09:00
Lorenzo Colitti
e9b4195087 Merge changes Ic5750d4f,I9fa888c9,I4211475f am: c127a58770 am: 5a27eb5043 am: 171f45afc8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia036fad7b5070679f382410107a14b0dbfd951e6
 2021-01-18 15:02:46 +00:00
Lorenzo Colitti
171f45afc8 Merge changes Ic5750d4f,I9fa888c9,I4211475f am: c127a58770 am: 5a27eb5043 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife4211d4f6892a0751ef71f284fd4a5f06148a82
 2021-01-18 14:46:03 +00:00
Lorenzo Colitti
5a27eb5043 Merge changes Ic5750d4f,I9fa888c9,I4211475f am: c127a58770 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e727e9e9377690a6badf1a56176138654459493
 2021-01-18 14:25:48 +00:00
Lorenzo Colitti
c127a58770 Merge changes Ic5750d4f,I9fa888c9,I4211475f 
* changes:
  Deflake testNetworkBlockedStatusAlwaysOnVpn
  Simplify testVpnRestrictedUsers.
  Add test coverage for LockdownVpnTracker.
 2021-01-18 14:03:54 +00:00
Treehugger Robot
36bc369260 Merge "Enforce that NetworkAgentInfo fields are never null." am: 3a6e50bdb9 am: c000462ea0 am: f8a9b5c78e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If07ff3b1b8dd2d6245cc38c8d25423da5392b6ae
 2021-01-18 11:49:08 +00:00
Treehugger Robot
f8a9b5c78e Merge "Enforce that NetworkAgentInfo fields are never null." am: 3a6e50bdb9 am: c000462ea0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56dc3dc6daafa2123f8f1fc40007cd52a4f7a21c
 2021-01-18 11:24:56 +00:00
Treehugger Robot
c000462ea0 Merge "Enforce that NetworkAgentInfo fields are never null." am: 3a6e50bdb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12eba91f29b55b7162889e1d44de15580f839195
 2021-01-18 10:24:27 +00:00
Treehugger Robot
3a6e50bdb9 Merge "Enforce that NetworkAgentInfo fields are never null." 2021-01-18 09:32:39 +00:00
junyulai
6ecf04d6f7 [VCN06] Support request background network 
This will be mainly used by VCN management service which will
need to hold the networks but preserve the backgrounded-ness
of the networks.

Test: android.net.ConnectivityManagerTest#testRequestType
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork /
      --rerun-until-failure 100
Test: ConnectivityServiceTest#testBackgroundNetworks
Test: m -j doc-comment-check-docs
Bug: 175662146
Change-Id: If9aaa87b7e71c2b695ac7b08858850e975b28bb6
 2021-01-18 16:32:08 +08:00
Lorenzo Colitti
5c27674ad1 Deflake testNetworkBlockedStatusAlwaysOnVpn 
This test flakes about 1% of the time on my device. This is due
to the test calling expectNetworkRejectNonSecureVpn() before the
handler thread has processed the call to setAlwaysOnVpnPackage.

Fix this by waiting for callbacks where it is possible to do so,
and by calling waitForIdle where it is not.

Test: test-only change
Change-Id: Ic5750d4fdf9e7e3654a2b6ade74da6bc5de18fb6
 2021-01-18 17:28:52 +09:00
Lorenzo Colitti
79ff36588d Simplify testVpnRestrictedUsers. 
Code review comments have suggested that this test is too long
and difficult to understand. Split it into two tests and put some
of the common setup into setup methods and statics.

Bug: 173331190
Test: test-only change
Change-Id: I9fa888c940d7048f1ba6836a5706fbdb84b5f5c9
 2021-01-18 17:28:52 +09:00
Lorenzo Colitti
756a7345e8 Add test coverage for LockdownVpnTracker. 
Also add a comment to an existing test.

Bug: 173331190
Test: test-only change
Change-Id: I4211475f053f0cdf2b804132c52ce5205a772193
 2021-01-18 17:28:50 +09:00
Lorenzo Colitti
83d065696f Enforce that NetworkAgentInfo fields are never null. 
These fields have been recently audited, confirmed never to be
null, and annotated @NonNull. Ensure that they can never become
null by throwing exceptions in the codepaths that set them.
Also remove some null checks.

Test: atest FrameworksNetTests
Change-Id: I6ce5bb4d69a990f1c857c599b7e50e372352eb87
 2021-01-18 07:49:26 +00:00
Lorenzo Colitti
82a1e88bc3 Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." am: f49e1b0c6c am: d9df019897 am: cc615e48ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d6b833342292026f5f0a91a96006ece31762b9a
 2021-01-18 07:20:11 +00:00
Lorenzo Colitti
cc615e48ce Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." am: f49e1b0c6c am: d9df019897 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07fa9035369c8abde6de395b21630b239bdd4247
 2021-01-18 07:06:06 +00:00
Lorenzo Colitti
d9df019897 Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." am: f49e1b0c6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I904873d1998948ef58e6179a78c5d87834fa7c86
 2021-01-18 06:33:36 +00:00
Paul Hu
bfd5f4ea02 Merge "Remove unused IpConnectivityMetrics in CS" am: 671085fbde am: 22a26d0918 am: c2115c380e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bac9e17a3584df017a83472a58c6353bdef845b
 2021-01-18 06:33:17 +00:00
Paul Hu
c2115c380e Merge "Remove unused IpConnectivityMetrics in CS" am: 671085fbde am: 22a26d0918 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64b20b343515f641146780ca9b9ec7bfb4ac586a
 2021-01-18 06:05:12 +00:00
Lorenzo Colitti
f49e1b0c6c Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." 2021-01-18 05:51:38 +00:00
Paul Hu
22a26d0918 Merge "Remove unused IpConnectivityMetrics in CS" am: 671085fbde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If123fae795475433f61f9264f0a2e3b51676056c
 2021-01-18 05:45:22 +00:00
Paul Hu
671085fbde Merge "Remove unused IpConnectivityMetrics in CS" 2021-01-18 05:26:35 +00:00
paulhu
a1b4fbe5a0 Remove unused IpConnectivityMetrics in CS 
ConnectivityService doesn't call any IpConnectivityMetrics
methods, so remove all usages from CS.

Bug: 177656797
Test: atest FrameworksNetTests
Test: atest FrameworksNetIntegrationTests
Change-Id: I2fb3b6b08cd8013eb8f75882f77ca699a2df927e
 2021-01-18 04:03:32 +00:00
Chiachang Wang
a26c02f27a Merge "Replace hidden ParcelFileDescriptor constructor usage" am: b60805b832 am: bddce89449 am: 263b7e551f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38369186c581fcde3e21c91af6b35ccd88320509
 2021-01-18 03:27:17 +00:00
Roshan Pius
8b48fa3ff4 Merge "LocationPermissionChecker: Exempt privileged components from location check" am: fdc3167044 am: 56b8d48921 am: 5573b0c726 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66afba490765f4eae803d0ea4e2cc3eb54528aa4
 2021-01-18 03:24:51 +00:00
Chiachang Wang
263b7e551f Merge "Replace hidden ParcelFileDescriptor constructor usage" am: b60805b832 am: bddce89449 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ac624ffc3f5bf4e14a1997f966ad444751517e
 2021-01-18 02:53:04 +00:00
Roshan Pius
5573b0c726 Merge "LocationPermissionChecker: Exempt privileged components from location check" am: fdc3167044 am: 56b8d48921 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45afdaba68269d59cfcf670ef7fdef6a19b3a9d2
 2021-01-18 02:52:29 +00:00
Chiachang Wang
bddce89449 Merge "Replace hidden ParcelFileDescriptor constructor usage" am: b60805b832 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3dcae7bce2b8168bff86cfccc7ce83d17d61006
 2021-01-18 02:28:04 +00:00
Roshan Pius
56b8d48921 Merge "LocationPermissionChecker: Exempt privileged components from location check" am: fdc3167044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4af673a7be59c0382f68fc53f1b2704746f53cc3
 2021-01-18 02:25:39 +00:00
Chiachang Wang
b60805b832 Merge "Replace hidden ParcelFileDescriptor constructor usage" 2021-01-18 01:59:10 +00:00