LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,125 Commits 2 Branches 0 Tags
99cf352cd1efa068c6099fb24dfe3acc589c595f
Commit Graph

14125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
99cf352cd1 Merge "Add NetworkRequest.Builder creating from an existing instance" into sc-dev 2021-03-22 13:17:43 +00:00
Chiachang Wang
c2e79ada6c Add NetworkRequest.Builder creating from an existing instance 
Provide a formal way to construct a new NetworkRequest from an
existing instance. The network capabilities inside the
NetworkRequest is hidden. There is no way to pass a
NetworkRequest and update its capabilities. Add
NetworkRequest.Builder creating from an existing instance to
allow to clone the network capabilities.

Bug: 172183305
Test: make update-api
Change-Id: I068462b2a1410daf67b0c95f2b643d396f079531
CTS-Coverage-Bug: 172183305
 2021-03-22 13:05:10 +00:00
Lorenzo Colitti
90acad1251 Merge changes I90bf7957,If58524b0 am: 029ba17cb0 am: c3e38ade53 am: b08e5aba25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I0420784d706f64b05137074bfcfb58cdc232b83b
 2021-03-22 12:34:17 +00:00
Chiachang Wang
adb8328ed1 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours am: 60450deb67 am: 7007e04119 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005

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

Change-Id: I52d135904ffc8cb4aae0166deb7bfaedc969a583
 2021-03-22 12:33:19 +00:00
Remi NGUYEN VAN
8908af0828 [automerger skipped] Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 am: 6a4a9423ef am: 8b4738d3b3 -s ours 
am skip reason: skip tag Change-Id I3f722075fb9c74e12e40348ba4faad2f0fa67178 with SHA-1 1bdf4ba870 is already in history

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

Change-Id: I26d0bb14c35b17086f66a4dfc6d7f727d9940cf2
 2021-03-22 12:32:55 +00:00
Remi NGUYEN VAN
751124c98c [automerger skipped] Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 am: 5024171a1f am: e6fb8c44dd -s ours 
am skip reason: skip tag Change-Id I3a67d266b32142c034520acbcdc30f7213db5e13 with SHA-1 c4dd8c9142 is already in history

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

Change-Id: I2d568af3f71ae143c535090487b0b85754421fa6
 2021-03-22 12:32:34 +00:00
Automerger Merge Worker
da66d09a7a Merge "Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 am: 0847f57ff9" into sc-dev 2021-03-22 12:32:25 +00:00
Remi NGUYEN VAN
92dcd3a24c Merge "Remove hidden Icon.createWithResource API usage" into sc-dev 2021-03-22 12:32:22 +00:00
Remi NGUYEN VAN
4d9190f91e Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 am: 0847f57ff9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646851

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

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

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

Change-Id: Ice84bb2e6d855ed88e7e432cf49739e69c9e01de
 2021-03-22 12:30:40 +00:00
Roshan Pius
fd994c97a2 [automerger skipped] resolve merge conflicts of d2c4f1d6c8 to stage-aosp-master am: 39ff19da2f am: c8ed8dce59 -s ours 
am skip reason: skip tag Change-Id Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3 with SHA-1 332e7a241a is already in history

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

Change-Id: I945ee90092cf1f8001a92b72a66373d92fbcd326
 2021-03-22 12:28:37 +00:00
Chiachang Wang
56294457bd [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours am: 9991401b9d -s ours am: 7d909af3bb -s ours 
am skip reason: skip tag Change-Id I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 6f96bb4b34 is already in history

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

Change-Id: I9986ddce8827a85982b0846e18044fc45ec95c24
 2021-03-22 12:28:01 +00:00
Lorenzo Colitti
03f2900d0a [automerger skipped] Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 am: a043655e3a -s ours 
am skip reason: skip tag Change-Id Ic0d24d36af0b87153d527083f8964ddc6cd78482 with SHA-1 9d239b5515 is already in history

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

Change-Id: Ie24e96154851ddeac6971e4bfa49a0eb43e5915c
 2021-03-22 12:27:31 +00:00
Lorenzo Colitti
b28d29738c [automerger skipped] Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775 am: 28a89348a9 -s ours 
am skip reason: skip tag Change-Id I35d28c8df341dbbac2774026c6ca749e296c0482 with SHA-1 3aa6043c46 is already in history

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

Change-Id: I886ca8978862d2dacc11d2bd5d4977698e953935
 2021-03-22 12:27:21 +00:00
Remi NGUYEN VAN
530bffa889 [automerger skipped] Add connectivity protos to framework-connectivity am: 953819d7f0 am: 00b56b8d0d am: 30c4960d7e -s ours 
am skip reason: skip tag Change-Id I2c4a37ff2ee9e8efde49885feeafa27dcff7ca2c with SHA-1 d2f03002c9 is already in history

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

Change-Id: I593f9d014d29a8041c9acbe1f3034f15613c88b5
 2021-03-22 12:27:12 +00:00
paulhu
a98994a3f5 [automerger skipped] Remove unused NetworkPolicyManagerInternal in CS am: c850635440 am: 143739703d am: 634e8a5b2a -s ours 
am skip reason: skip tag Change-Id I8719ef2e96e7db9da2894b467b9e7a1bc09de386 with SHA-1 d97c467e2a is already in history

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

Change-Id: I3bfe4457a7b9f3a0b7f2f3604f0f1745c96cb7bb
 2021-03-22 12:26:52 +00:00
Remi NGUYEN VAN
fbc44046d9 [automerger skipped] Move connectivity AIDLs to android.net am: 6ed4472b63 am: e6fe8b4103 am: 909eb08445 -s ours 
am skip reason: skip tag Change-Id I611f1941698c574e37aea912ee76dadc8b32e41a with SHA-1 8ffe4eb5e3 is already in history

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

Change-Id: Ice5060b366cfb6cbce6e6151f2fb1a1208e9b939
 2021-03-22 12:26:41 +00:00
Remi NGUYEN VAN
18c08a91be [automerger skipped] Migrate framework-connectivity internal resources am: 8e12782094 am: 1f00de9e81 am: 50fab6449d -s ours 
am skip reason: skip tag Change-Id I77a3efca2cd644f9828db1ed5d3cae8070fb8363 with SHA-1 4d49a1922a is already in history

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

Change-Id: I17ffd47283c43a6df1e61ca9ef864ca32d99e4e9
 2021-03-22 12:26:31 +00:00
Remi NGUYEN VAN
7e85f08312 [automerger skipped] Add multipath preference, background status API am: 0f91b7a19a am: 6f3429172b am: 3f139e72f6 -s ours 
am skip reason: skip tag Change-Id I8a03162b2f6691086bb64e75ffd354cdfca7f86a with SHA-1 92f20605d8 is already in history

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

Change-Id: I147c04bb30ed920679d88cd765b7517ca4fbd12e
 2021-03-22 12:26:13 +00: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
2c5b333737 [automerger skipped] Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4385ef6896 am: cc018f77ec am: db1ad4da2b -s ours 
am skip reason: skip tag Change-Id I99c0d28069dd1a13d452105b0a83a03a833232a2 with SHA-1 3b8af467a8 is already in history

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

Change-Id: I97d82338363702be56963839a241e1d72c1e9c86
 2021-03-22 11:00:35 +00:00
Remi NGUYEN VAN
fff9cd3b1c Remove hidden Icon.createWithResource API usage 
Icon.createWithResource(Context, int) is public, but
Icon.createWithResource(Resources, int) is a hidden API.

Replace the former by the latter in NetworkNotificationManager, so that
it builds against stable APIs.

Bug: 182125649
Test: atest FrameworksNetTests
Change-Id: Ied29d3c7fb517d0c82f40662a1e0e87186c3a89e
 2021-03-22 10:34:24 +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
Lucas Lin
def33143e8 Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev 2021-03-22 09:38:26 +00:00
Remi NGUYEN VAN
a12c9fa7cf Merge "Add NetworkFactory to connectivity jarjar rules" into sc-dev 2021-03-22 09:27:06 +00:00
lucaslin
865b4f2ade Remove the usage of NETID_UNSET from Vpn.java 
Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET
when getNetwork() returns null in ConnectivityServiceTest.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109
 2021-03-22 08:29:18 +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
Lucas Lin
2ad15eca0c Merge "Expose some APIs from ConnectivityManager" into sc-dev 2021-03-22 06:44:49 +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
lucaslin
5140e48a49 Expose some APIs from ConnectivityManager 
- Expose setRequireVpnForUids to Vpn.java
- Expose setLegacyLockdownVpnEnabled to LockdownVpnTracker.java
- Expose requestRouteToHostAddress to
  GnssNetworkConnectivityHandler.java

Bug: 182963397
Test: m
Change-Id: I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c
 2021-03-22 11:51:27 +08:00
Remi NGUYEN VAN
0c66c1a253 Add NetworkFactory to connectivity jarjar rules 
NetworkFactory is part of net-utils-device-common, but is outside of
the com.android.net.module.util and needs a separate jarjar rule.

Bug: 171540887
Test: atest FrameworksNetTests
Change-Id: Iec828a789175acdbe4e7f35e4cc942922540495c
 2021-03-22 03:50:15 +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