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

12967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
b40480c2ea Expose uids related APIs in NetworkRequest and NetworkCapabilities 
NetworkRequest is moving into the incoming connectivity mainline
module. The hidden setUids becomes inaccessible outside the
module. Shims for support cts in different API levels will need
to use it to verify the behavior of NetworkRequest. Thus, expose
it to the API surface.

Also, VPN uses getUids and setUids to control network
capabilities. Networkcapabilities is a part of incoming
connectivity mainline module but VPN is not. Thus, exposing these
two methods are needed to allow VPN to continue using it.

Test: make update-api
Bug: 172183305
Merged-In: I107c329d4d7130d488772166eae8b5e7aaa2ff04
Change-Id: If76877e6bde7abe3b5ddde078f87eefd027e675c
 2021-03-23 01:33:16 +09:00
Chiachang Wang
c347b9c341 Replace the usage of UidRange 
UidRange is used in a shared way between ConnectivityService
and VPN through the use of NetworkCapabilities. UidRange will
be part of the ConnectivityService mainline but Vpn.java will
stay in the framework. We need a way to replace the APIs using
UidRange, or to make UidRange system API. The only really
relevant surface here is NetworkCapabilities#{setUids, getUids}.
The need for UidRange could be replaced by an integer Range, so
replace the usage of UidRange by a integer Range in
NetworkCapabilities#{setUids, getUids} and update the relevant
callers.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9
Change-Id: Idb7f353788c5779a4fbbd107595e9326b99fe0a8
 2021-03-23 01:02:00 +09:00
Lorenzo Colitti
b08e5aba25 Merge changes I90bf7957,If58524b0 am: 029ba17cb0 am: c3e38ade53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I13d23ef04c694527a4440f6bed21699684ec7424
 2021-03-22 11:01:50 +00:00
Lorenzo Colitti
c3e38ade53 Merge changes I90bf7957,If58524b0 am: 029ba17cb0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I1c3de9d738a294e9d21314de84384fa89745285d
 2021-03-22 10:17:37 +00:00
Lorenzo Colitti
029ba17cb0 Merge changes I90bf7957,If58524b0 
* changes:
  Fix privileged apps calling registerDefaultNetworkCallback.
  Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback.
 2021-03-22 09:43:53 +00:00
Chiachang Wang
7007e04119 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours am: 60450deb67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005

Change-Id: Ifa4c6a30dfec86d8860c365b3f4b343599ab3524
 2021-03-22 07:37:17 +00:00
Treehugger Robot
d914ad7ad9 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours am: 8297bc95a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640144

Change-Id: I553b1c59e6a35c8e8a0ac7dc59d2367bffa1f39d
 2021-03-22 07:37:02 +00:00
Chiachang Wang
60450deb67 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours 
am skip reason: skipped by user chiachangwang

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

Change-Id: Ib56fafd17dc88b9ded6cd39501a3bfa4cf5fe1b5
 2021-03-22 07:17:25 +00:00
Treehugger Robot
8297bc95a0 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours 
am skip reason: skipped by user chiachangwang

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

Change-Id: Ib61e9100ff497a22a900aa13a83027242ddddecb
 2021-03-22 06:55:09 +00:00
Chiachang Wang
3f603fae13 Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" 2021-03-22 06:26:33 +00:00
Chiachang Wang
f2b0b41764 Revert "Correct the logic in NetworkCapabilitiesTest" 
This reverts commit 628ada1d2d.

Reason for revert: <Merge abnormal in automerger>

Change-Id: I0cdb401f4962050bf24dc9d9871d4ef15cf52629
 2021-03-22 06:15:02 +00:00
Remi NGUYEN VAN
8b4738d3b3 Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 am: 6a4a9423ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644991

Change-Id: Id66ea1eda381be3b42a3ccf553d831d49b5fb7b7
 2021-03-22 04:01:28 +00:00
Remi NGUYEN VAN
e6fb8c44dd Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 am: 5024171a1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635319

Change-Id: Id6fa989fa1d24261d29ab61d0a666cc6a33dc7b8
 2021-03-22 04:01:01 +00:00
Remi NGUYEN VAN
0847f57ff9 Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646851

Change-Id: I8ee539eb915c0f0aaab509fb7eb170af4d9c4b5c
 2021-03-22 04:00:11 +00:00
Treehugger Robot
4345a9b287 Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 am: dea1480c0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636022

Change-Id: Ib2e695f5418c8dfb17f8e96c9e465efdc822cc48
 2021-03-22 03:59:30 +00:00
Remi NGUYEN VAN
3b780f79d3 Merge "Add SystemMessages protos to Connectivity" am: cf638d345b am: 02e5fcf301 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626204

Change-Id: Icba10b315bd45512a2de8d8d22c3e7451a2365c0
 2021-03-22 03:58:38 +00:00
Jayachandran Chinnakkannu
61bfb06808 Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d am: f3f342370a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628901

Change-Id: I2bf2b8a3eccf7dab7ac22efd9a444dbaa67faa79
 2021-03-22 03:58:17 +00:00
Roshan Pius
c8ed8dce59 resolve merge conflicts of d2c4f1d6c8 to stage-aosp-master am: 39ff19da2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944446

Change-Id: Ia4f30adab268c9c51d89d61355a48da00b855190
 2021-03-22 03:55:23 +00:00
Remi NGUYEN VAN
6a4a9423ef Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644991

Change-Id: Ifca29ba189f58655b0229467e2d86b0b6426b2d1
 2021-03-22 03:32:31 +00:00
Remi NGUYEN VAN
5024171a1f Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635319

Change-Id: I0a933c31e05428526a5c6fb4ef694f7c4cf818bb
 2021-03-22 03:29:41 +00:00
Remi NGUYEN VAN
1a7066d0a5 Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646851

Change-Id: I829c839620849e3a49be0f2629157f4adb9a1dcb
 2021-03-22 03:26:46 +00:00
Treehugger Robot
dea1480c0b Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636022

Change-Id: Ifbad5630a39f8990479a5f20e018a3a499334fe1
 2021-03-22 03:23:48 +00:00
Remi NGUYEN VAN
02e5fcf301 Merge "Add SystemMessages protos to Connectivity" am: cf638d345b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626204

Change-Id: I8648b09a97485dcecac2e5075d605e79a730ec3f
 2021-03-22 03:20:45 +00:00
Jayachandran Chinnakkannu
f3f342370a Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628901

Change-Id: I2c371b6f1dc25f84a389480e46d9d582e9da148b
 2021-03-22 03:18:17 +00:00
Treehugger Robot
58f4cdf3b3 Merge "Correct the logic in NetworkCapabilitiesTest" 2021-03-22 02:20:19 +00:00
Remi NGUYEN VAN
afdb6a7347 Merge "Remove Preconditions usage in TestNetworkSpecifier" 2021-03-22 01:40:44 +00:00
Remi NGUYEN VAN
aa1d743312 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" 2021-03-22 01:40:28 +00:00
Remi NGUYEN VAN
b2fe416e82 Merge "Add TEST_MAPPING for Connectivity" 2021-03-22 01:39:51 +00:00
Treehugger Robot
33b1df7ec4 Merge "Move trimV4AddrZeros to libs/net" 2021-03-22 01:37:06 +00:00
Remi NGUYEN VAN
508d3cf1d6 Remove Preconditions usage in TestNetworkSpecifier 
Preconditions is a hidden API utility. It can be easily replace by
inline checks.

Bug: 177046265
Test: m
Change-Id: I3f722075fb9c74e12e40348ba4faad2f0fa67178
Merged-In: I3f722075fb9c74e12e40348ba4faad2f0fa67178
 2021-03-22 00:02:10 +00:00
Remi NGUYEN VAN
acd6de1364 Revert "Revert "Remove connectivity dependency on Preconditions"" 
Preconditions.checkNotNull is deprecated to be replaced by
Objects.requireNonNull, and other methods can easily be replaced by
inline checks.

Preconditions is an internal API class that should not be used by
unbundled jars.

Bug: 177046265
Change-Id: I3a67d266b32142c034520acbcdc30f7213db5e13
Merged-In: I3a67d266b32142c034520acbcdc30f7213db5e13
Test: m
 2021-03-22 00:01:43 +00:00
Remi NGUYEN VAN
cf638d345b Merge "Add SystemMessages protos to Connectivity" 2021-03-21 23:58:00 +00:00
Jayachandran Chinnakkannu
fce4049a1d Merge "Swap parameters in QosCallback#registerQosCallback" 2021-03-21 21:02:36 +00:00
Roshan Pius
39ff19da2f resolve merge conflicts of d2c4f1d6c8 to stage-aosp-master 
Merged-In: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
 2021-03-21 19:20:35 +00:00
Chiachang Wang
7d909af3bb [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours am: 9991401b9d -s ours 
am skip reason: skip tag Change-Id I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 f379ceec8e is already in history

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

Change-Id: Iecaae6936535a5c00d1a895c1410d2f0e5531261
 2021-03-21 17:30:02 +00:00
Lorenzo Colitti
a043655e3a Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297

Change-Id: I5d547c23baf7798e09d9d9aad188f094ebfe4cfe
 2021-03-21 17:29:33 +00:00
Lorenzo Colitti
c62368fd7a Fix privileged apps calling registerDefaultNetworkCallback. 
When registerDefaultNetworkCallback is called by an app that has
NETWORK_SETTINGS, the UID of the app is forgotten and the request
that is filed has an empty UID set. This results in that request
matching networks that have UID ranges that do not include it,
e.g., VPNs.

Fix this by ensuring that the UID ranges are properly set.

Bug: 165835257
Test: updated specific tests for this bug
Change-Id: I90bf79573342c144d1cfbc2f61a3155fdd5b1fa7
 2021-03-22 02:29:29 +09:00
Lorenzo Colitti
28a89348a9 Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645000

Change-Id: I22e26261dcc59274c4286271409ee63c1760b074
 2021-03-21 17:29:29 +00:00
Lorenzo Colitti
053b2a2737 Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback. 
Currently, if a process with NETWORK_SETTINGS registers a default
network callback, its uid will be ignored and replaced with an
empty list of UIDs. This means it will incorrectly match VPNs
with any UID range.

Add a test for this bug to make it easier to review the upcoming
change that fixes it.

Bug: 165835257
Test: test-only change
Change-Id: If58524b01fdd60045fb7236d17dedf31fb563f99
 2021-03-22 02:29:29 +09:00
Remi NGUYEN VAN
30c4960d7e Add connectivity protos to framework-connectivity am: 953819d7f0 am: 00b56b8d0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635040

Change-Id: Ieaa65408c13f5224b23cae8a4cebf79b4d7ed676
 2021-03-21 17:29:25 +00:00
paulhu
634e8a5b2a Remove unused NetworkPolicyManagerInternal in CS am: c850635440 am: 143739703d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646969

Change-Id: I8e19008eb864b2cafc1725e96b85c51372913c22
 2021-03-21 17:29:21 +00:00
Remi NGUYEN VAN
909eb08445 Move connectivity AIDLs to android.net am: 6ed4472b63 am: e6fe8b4103 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596272

Change-Id: I6cf9779f473b623d9aea6e67e1c57e2d6731617d
 2021-03-21 17:29:17 +00:00
Remi NGUYEN VAN
50fab6449d Migrate framework-connectivity internal resources am: 8e12782094 am: 1f00de9e81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641905

Change-Id: If36c3148d1a8c487ca3f25fa65e9b593f4e4d19d
 2021-03-21 17:29:14 +00:00
Remi NGUYEN VAN
3f139e72f6 Add multipath preference, background status API am: 0f91b7a19a am: 6f3429172b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644388

Change-Id: I437cb3ab5a778004c7bc03156b74e9e04f93b55b
 2021-03-21 17:29:04 +00:00
Chiachang Wang
9991401b9d [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours 
am skip reason: skip tag Change-Id I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 f379ceec8e is already in history

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

Change-Id: I1773af223afb67d522cc05d3658608505340023e
 2021-03-21 16:55:29 +00:00
Lorenzo Colitti
dd37a5d576 Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297

Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3
 2021-03-21 16:51:02 +00:00
Lorenzo Colitti
eb0dc8f775 Cherry-pick some test changes from ag/13210542. am: e7963a1d82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645000

Change-Id: Iebfee24a963aac516bf44ef70128ffdaeec25a45
 2021-03-21 16:48:06 +00:00
Remi NGUYEN VAN
00b56b8d0d Add connectivity protos to framework-connectivity am: 953819d7f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635040

Change-Id: Idebb84324407d0ce2f0066888b14fc22df736515
 2021-03-21 16:45:11 +00:00
paulhu
143739703d Remove unused NetworkPolicyManagerInternal in CS am: c850635440 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646969

Change-Id: I5a838b1017d1648e67576bfd7940ea9161b2c764
 2021-03-21 16:43:40 +00:00
Remi NGUYEN VAN
e6fe8b4103 Move connectivity AIDLs to android.net am: 6ed4472b63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596272

Change-Id: If61c15ea55ec2081eab7fd2368e77f16ef51c769
 2021-03-21 16:41:38 +00:00