LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,087 Commits 2 Branches 0 Tags
aad5bc244b6bf397d90b40834ff0c42148da51cb
Commit Graph

13087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
aad5bc244b Merge "Minor fixes to LockdownVpnTracker." am: 63072f5113 am: 3926e61925 am: ca49f2e37c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3571722156aaaa6c04b812e58dd011f37029cdb
 2021-02-15 08:12:27 +00:00
Lorenzo Colitti
ca49f2e37c Merge "Minor fixes to LockdownVpnTracker." am: 63072f5113 am: 3926e61925 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cfdfe54af4ff25e6ca8aee8ddccc74882a72f71
 2021-02-15 07:38:20 +00:00
Lorenzo Colitti
3926e61925 Merge "Minor fixes to LockdownVpnTracker." am: 63072f5113 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib400714e6faa8cf06487c5d6c721fdd444164fa4
 2021-02-15 06:58:45 +00:00
Lorenzo Colitti
63072f5113 Merge "Minor fixes to LockdownVpnTracker." 2021-02-15 06:25:16 +00:00
Treehugger Robot
22786143a4 Merge "Expose VpnTransportInfo as module-lib API." am: 30f9755ffc am: 73d58fb722 am: aeba5e6808 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71abed2260e6b57a96132c1e978f499809ce98cc
 2021-02-15 06:24:53 +00:00
Treehugger Robot
aeba5e6808 Merge "Expose VpnTransportInfo as module-lib API." am: 30f9755ffc am: 73d58fb722 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c86cd1089bd4fe406fadf2e0ab6609558ed8510
 2021-02-15 05:51:10 +00:00
Treehugger Robot
73d58fb722 Merge "Expose VpnTransportInfo as module-lib API." am: 30f9755ffc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746f6c33ae1076aa057eca1c731847bf59b7ba66
 2021-02-15 05:24:28 +00:00
Treehugger Robot
30f9755ffc Merge "Expose VpnTransportInfo as module-lib API." 2021-02-15 04:54:13 +00:00
Lorenzo Colitti
f22aa33bc6 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 6e423b8024 am: f390bd61d7 am: 321e1c1f6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I698b6b082b121c004b2c8b05ef423da1bd8b871b
 2021-02-15 01:32:50 +00:00
Lorenzo Colitti
321e1c1f6a Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 6e423b8024 am: f390bd61d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91816c01a799a89b89098a6e9ff256dae7d31dbf
 2021-02-15 01:03:06 +00:00
Lorenzo Colitti
a0473fccb7 Minor fixes to LockdownVpnTracker. 
1. Remove the legacy network type. This is only used for logging.
   - Replace the logcat logging with the display transport
   - Remove the EventLogTags logging, since it's likely not
     actually used by anyone.

2. Remove code that checks for NetworkInfo objects in state
   FAILED, since LockdownVpnTracker can never have received any
   such NetworkInfo from ConnectivityService since lollipop.

Bug: 173331190
Test: passes existing tests in ConnectivityServiceTest
Change-Id: I66ed71e51ba18b95862f3a0a5df2775eecea501e
 2021-02-15 09:58:20 +09:00
Lorenzo Colitti
30ac156ae5 Expose VpnTransportInfo as module-lib API. 
This information originates in non-mainline system server code
and needs to be passed to the connectivity mainline code.

Bug: 173331190
Test: already covered by CTS tests
Change-Id: Ic612b6a51f7ec13e2213c8754312cf716130c876
 2021-02-15 09:34:19 +09:00
Lorenzo Colitti
f390bd61d7 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 6e423b8024 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I042d739aff199b0c7dff06008dcfaa9492e08d95
 2021-02-15 00:30:46 +00:00
Lorenzo Colitti
6e423b8024 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 
* changes:
  Check registering system default callback needs NETWORK_SETTINGS.
  Move VPN code from ConnectivityService to VpnManagerService.
  Add a skeleton VpnManagerService, and start it on boot.
  Convert LockdownVpnTracker to NetworkCallbacks.
  Minor fixes to VpnTransportInfo.
 2021-02-15 00:00:47 +00:00
James Mattis
e8bae87a06 Merge changes from topics "pans", "pans-permission" am: 68658a18c7 am: 6e19867390 am: c4221b6a75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20fdb2f06b473f9f92e62138e72bd30d4384a267
 2021-02-14 09:51:16 +00:00
James Mattis
c4221b6a75 Merge changes from topics "pans", "pans-permission" am: 68658a18c7 am: 6e19867390 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8afdee99c0b0813d3e3a61df053f9cdef966949c
 2021-02-13 21:51:49 +00:00
James Mattis
6e19867390 Merge changes from topics "pans", "pans-permission" am: 68658a18c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882
 2021-02-13 21:14:48 +00:00
James Mattis
68658a18c7 Merge changes from topics "pans", "pans-permission" 
* changes:
  Marking setOemNetworkPreference as @SystemApi
  Adding permission for OEM managed preferences
  Implementation of setOemNetworkPreference
 2021-02-13 20:54:57 +00:00
Yan Yan
3d818137f3 Merge changes Ifc8ad902,I6d1b8d0e am: 87c6253518 am: 66b74e588b am: 913569d3e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3235dd38e4c4912f986cbb27867ff14fe38e81
 2021-02-12 22:46:32 +00:00
Yan Yan
913569d3e5 Merge changes Ifc8ad902,I6d1b8d0e am: 87c6253518 am: 66b74e588b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7bedd741266a08bf2eef515f1fb72a9aebc74e3
 2021-02-12 22:12:07 +00:00
Yan Yan
66b74e588b Merge changes Ifc8ad902,I6d1b8d0e am: 87c6253518 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12bd81925142b20a04448952de67cb72d77b4ccd
 2021-02-12 21:41:59 +00:00
Yan Yan
87c6253518 Merge changes Ifc8ad902,I6d1b8d0e 
* changes:
  [API] Expose IpSecTunnelInterface#setUnderlyingNetwork
  Update underlying network of IpSecTunnelInterface
 2021-02-12 21:23:29 +00:00
Treehugger Robot
e0ad927a21 Merge "Stop using Slog in QosCallbackTracker." am: 3b78cadc29 am: 55db18c16b am: a62a0be37d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585567

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie04d9930a56f305e1292c682d9c28a2e8f95a811
 2021-02-12 06:13:22 +00:00
Treehugger Robot
a62a0be37d Merge "Stop using Slog in QosCallbackTracker." am: 3b78cadc29 am: 55db18c16b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585567

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25baa31f1d7d148a78e29ae46a152b6b5e245d0b
 2021-02-12 05:48:35 +00:00
Treehugger Robot
55db18c16b Merge "Stop using Slog in QosCallbackTracker." am: 3b78cadc29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585567

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6df42ce17addb1f433eba440ba4593b2e4ca57e5
 2021-02-12 05:18:13 +00:00
James Mattis
7a25354727 Marking setOemNetworkPreference as @SystemApi 
Marking setOemNetworkPreference in ConnectivityManager as @SystemApi.

Bug: 176496438
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I4681c88dc3a83f71c387b29610c33594e57cb43f
 2021-02-11 20:38:21 -08:00
James Mattis
981865c88f Adding permission for OEM managed preferences 
Adding CONTROL_OEM_PAID_NETWORK_PREFERENCE as a signature level
permission to allow an application to control OEM managed network
preferences.

Bug: 176496438
Bug: 176494815
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk
Change-Id: Iee13e89f3931c7079c2d88cb57b249b1b1cf93ad

Change-Id: Id29cafe1eaf5dff8a0605cb2579204d9c77b7e70
 2021-02-11 20:38:21 -08:00
James Mattis
6e6fabf657 Implementation of setOemNetworkPreference 
Main implementation of ConnectivityService.setOemNetworkPreference. This
covers the main requirements of this method including listener
functionality.

Bug: 176495594
Bug: 177101287
Bug: 176494815
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I8d318ab07785e52dd84d6261fdea8f318dce9bc5
 2021-02-11 20:38:18 -08:00
Treehugger Robot
3b78cadc29 Merge "Stop using Slog in QosCallbackTracker." 2021-02-12 04:03:12 +00:00
Lorenzo Colitti
aa5a8b2c6d Stop using Slog in QosCallbackTracker. 
This is not public API. Use Log instead.

Test: m
Fix: 172050541
Change-Id: I281831431e2edcf9a3b77122ad8736b94aa8e215
 2021-02-12 01:40:06 +00:00
Lorenzo Colitti
d5e9f98e28 Check registering system default callback needs NETWORK_SETTINGS. 
Also address a code review comment.

Bug: 173331190
Test: test-only change
Change-Id: Ia68f482af6d10af203bdbd4e14a12ae0b12bb6b5
 2021-02-12 01:12:48 +09:00
Lorenzo Colitti
0dd4b6f512 Move VPN code from ConnectivityService to VpnManagerService. 
ConnectivityService itself does not depend on mVpns or the Vpn
class any more. Most of this CL is simply moving code from one
class to another:

- Move the AIDL calls from IConnectivityManager to IVpnManager.
- Move the implementation from ConnectivityService to
  the new VpnManagerService.
- Move the APIs from ConnectivityManager to VpnManager, but
  temporarily maintain some shims in ConnectivityManager for the
  moved calls so that existing callers do not have to be modified
  in this CL.
- Update VpnService to call IVpnManager instead of
  IConnectivityManager.
- Move the code that registers the VpnManager service from
  ConnectivityFrameworkInitializer to SystemServiceRegistry.

Bug: 173331190
Test: atest HostsideVpnTests FrameworksNetTests CtsNetTestCases
Change-Id: I4911e2144df721a94fa00da9edf0dc372a7091c2
 2021-02-12 01:12:24 +09:00
Lorenzo Colitti
bfad39fe98 Add a skeleton VpnManagerService, and start it on boot. 
This adds a lot of unused code but this should make it easier to
review subsequent CLs.

Bug: 173331190
Test: builds, boots, "dumpsys vpnmanager" succeeds
Change-Id: Ied379654a0c3ab6242d3125661fe30f322395059
 2021-02-12 01:07:29 +09:00
Lorenzo Colitti
549e9acd92 Convert LockdownVpnTracker to NetworkCallbacks. 
This will allow moving LockdownVpnTracker from the connectivity
to the VPN code. This requires moderate refactoring since it's
pretty tightly coupled to both.

In this CL:

1. Add an @hide API to tell ConnectivityService that legacy
   lockdown VPN is enabled. I chose not to use the existing
   setVpnRequiredForUids API because that method has specific
   semantics and because it will be required long term since
   it's used by non-legacy VPN types.

2. Instead of updating LockdownVpnTracker inline from the
   ConnectivityService handler thread, have it listen to
   NetworkCallbacks. This introduces an extra thread hop, but
   most of the interactions between the lockdown VPN and CS were
   via NetworkAgent, which is asynchronous anyway.

3. Add code to LegacyTypeTracker to send the extra
   CONNECTIVITY_ACTION broadcast for the underlying network type
   that is sent after the VPN connects. In order to do this, make
   Make LockdownVpnTracker specify its underlying network
   (via setUnderlyingNetworks) when it connects.

4. Reimplement LockdownVpnTracker#augmentNetworkInfo based on
   information that is available in ConnectivityService.

5. Remove the code in LockdownVpnTracker that counted errors.
   I think this code has not worked since lollipop, because
   ConnectivityService never sees NetworkInfo objects in state
   FAILED. This is because ConnectivityService only hears about
   NetworkInfo objects via NetworkAgents, and LegacyVpnRunner
   only registers its NetworkAgent when the connection succeeds.

Bug: 173331190
Test: passes existing tests in ConnectivityServiceTest
Change-Id: I66d18512882efd468ee0ecec61f28786a195b357
 2021-02-12 01:07:29 +09:00
Lorenzo Colitti
720f3cc167 Minor fixes to VpnTransportInfo. 
This CL addesses comments on aosp/1570921.

Bug: 173331190
Test: new test coverage
Change-Id: Ie8e1bd63bb818a03f4b17402e1b365577ca034a2
 2021-02-11 23:28:00 +09:00
Roland Levillain
c548da762e [automerger skipped] Merge changes from topic "int32ref" am: 8437d37bd0 am: 947f8c8acf am: 541fc05fd4 -s ours 
am skip reason: Change-Id I9b63146ae563ed977f3112c9910f7a7c575de0b8 with SHA-1 9067134008 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cfca5ee873f7b1eb8bba76d63af6b66b0f453e4
 2021-02-11 13:28:00 +00:00
Roland Levillain
541fc05fd4 Merge changes from topic "int32ref" am: 8437d37bd0 am: 947f8c8acf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8511efa59e8d8617f48d62ee52d9e7ae15458253
 2021-02-11 13:06:09 +00:00
Roland Levillain
947f8c8acf Merge changes from topic "int32ref" am: 8437d37bd0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86dde2fef971759b4720cfb242e8954baacf9d84
 2021-02-11 12:43:56 +00:00
Roland Levillain
8437d37bd0 Merge changes from topic "int32ref" 
* changes:
  [Mainline] android.system package APIs migration
  Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore
 2021-02-11 12:05:36 +00:00
Yan Yan
00387a2654 Update underlying network of IpSecTunnelInterface 
Bug: 169855650
Test: atest IpSecManagerTunnelTest
Change-Id: I6d1b8d0e49f89c67ddc2caf4ba63fb0b1eb062c0
 2021-02-10 14:51:43 -08:00
Roland Levillain
81960ab4a6 Merge changes from topic "cherrypick-android_util-a0ae5zk4cb" into sc-dev 
* changes:
  [Mainline] android.system package APIs migration
  Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore
 2021-02-10 18:23:48 +00:00
Serik Beketayev
9067134008 [Mainline] android.system package APIs migration 
By removing Int32Ref.

Bug: 179703584
Bug: 177619520
Test: mma
Change-Id: I9b63146ae563ed977f3112c9910f7a7c575de0b8
Merged-In: I9b63146ae563ed977f3112c9910f7a7c575de0b8
(cherry picked from commit 1a2d570c3a7122940097aa7e983a7240d163c41a)
 2021-02-10 18:23:22 +00:00
Hai Shalom
f578bf4914 Merge "Support for Terms & Conditions notification" am: 67bb51ec40 am: fed30f42e8 am: b5a72aa56d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a47d12f41b9247910078ec8d6cd6e1f1589956e
 2021-02-10 16:55:42 +00:00
Hai Shalom
b5a72aa56d Merge "Support for Terms & Conditions notification" am: 67bb51ec40 am: fed30f42e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I233420be11a45376bb6771389e440fcd92c94fb5
 2021-02-10 16:32:46 +00:00
Hai Shalom
fed30f42e8 Merge "Support for Terms & Conditions notification" am: 67bb51ec40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibabb4e549706c5ab263aab9df78c9e5a0bff95de
 2021-02-10 15:40:25 +00:00
Hai Shalom
67bb51ec40 Merge "Support for Terms & Conditions notification" 2021-02-10 15:36:58 +00:00
Serik Beketayev
13279169ae [Mainline] android.system package APIs migration 
By removing Int32Ref.

Bug: 177619520
Bug: 179703584
Test: mma
Change-Id: I9b63146ae563ed977f3112c9910f7a7c575de0b8
Merged-In: I9b63146ae563ed977f3112c9910f7a7c575de0b8
(cherry picked from commit 63be51447826b077a1048901bb1aa73adb321ee1)
 2021-02-10 12:34:46 +00:00
Lorenzo Colitti
6c9655f273 Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 5e21b83410 am: 5eac15c044 am: 22b1c63d51 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I961b6442d53c1cb00af642866b7e49d151a9ab1e
 2021-02-10 07:46:14 +00:00
Lorenzo Colitti
22b1c63d51 Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 5e21b83410 am: 5eac15c044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If16c695f15a12615811545836b4117225097d6a4
 2021-02-10 07:20:26 +00:00
Lorenzo Colitti
5eac15c044 Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 5e21b83410 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83b4210780cf87006be5f55439ade06cd7893530
 2021-02-10 06:55:56 +00:00