LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,611 Commits 2 Branches 0 Tags
73aa6487dfe7df2ca57e5cbbfc1273a1bd41671d
Commit Graph

14611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyu Lai
73aa6487df Merge "Allow network providers to set the linger duration." into sc-dev 2021-04-15 03:23:53 +00:00
Chalard Jean
aac20e132d Merge "Use filter from CollectionUtils." into sc-dev 2021-04-14 12:38:01 +00:00
Chalard Jean
e634b28204 Allow network providers to set the linger duration. 
Test: atest CtsNetTestCases:NetworkAgentTest#testSetLingerDuration
Ignore-AOSP-First: prevent merge conflict
CTS-Coverage-Bug: 184796264
Bug: 184227264
Change-Id: I7f420faa40863385114705d6971cf00887d03318
 2021-04-14 20:26:12 +08:00
Bill Yi
14e9acc88d [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours am: 7771a62ab1 -s ours am: 3b8115928b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie382825bbc4a1b0cda64fe7a118dd6066b2cae7c
 2021-04-14 07:16:31 +00:00
Bill Yi
3b8115928b [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours am: 7771a62ab1 -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

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

Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be
 2021-04-14 06:31:20 +00:00
Bill Yi
7771a62ab1 [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

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

Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
 2021-04-14 05:46:16 +00:00
Bill Yi
24c6eaea15 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:51 +00:00
Lorenzo Colitti
cb6798a90a Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42 am: d76eb01fbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
 2021-04-14 03:00:32 +00:00
Bill Yi
51f05deb78 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
 2021-04-13 19:36:45 -07:00
Lorenzo Colitti
d76eb01fbe Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
 2021-04-14 02:33:11 +00:00
Bill Yi
49bae33c5e [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 32cf6f6f6b -s ours am: 7d7b5bcb9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1d72d31954f31f9f1cefa3bd557c5bce3fb6f9e
 2021-04-14 01:30:08 +00:00
Lorenzo Colitti
c6a866fb42 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
 2021-04-14 01:24:19 +00:00
Bill Yi
7d7b5bcb9f [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 32cf6f6f6b -s ours 
am skip reason: skip tag Change-Id I9af489ae7bdd448c552c97d4478f1760a13fb970 with SHA-1 4aed3924ff is already in history

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

Change-Id: I9999bfe514fffa9f300643e74942db5ae556670a
 2021-04-14 00:31:09 +00:00
Bill Yi
32cf6f6f6b Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE 
Merged-In: I9af489ae7bdd448c552c97d4478f1760a13fb970
Change-Id: I368382a9924b2d3dc697ae6450239f23d5cbf520
 2021-04-13 15:34:44 -07:00
Lorenzo Colitti
1479494fd5 Add @RedactionType annotations to VpnTransportInfo. 
This is in response to API council feedback.

Test: m
Bug: 185226718
Change-Id: I63d7249e7d14ac00558f311a3583f6adbf80e3d9
 2021-04-14 00:28:19 +09:00
Pedro Loureiro
8d6b5c8d6f Merge "Add lint baseline to address NewApi errors" into sc-dev 2021-04-13 14:12:41 +00:00
Chiachang Wang
93f6590e65 Merge "Extend framework-connectivity.impl visibility to more test" into sc-dev 2021-04-13 13:27:45 +00:00
Chiachang Wang
00cb5f4763 Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26 am: 7ebbfc98d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Ic0b7887630c00404ff354c193b82a96930940556
 2021-04-13 13:06:43 +00:00
Chiachang Wang
7ebbfc98d2 Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
 2021-04-13 11:54:57 +00:00
Pedro Loureiro
2507c8b9c5 Add lint baseline to address NewApi errors 
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.

Bug: 150847901

Test: m lint-check
Change-Id: Ide8a8fe80ba31396f23853ab266afcbcc33af9a6
 2021-04-13 10:51:51 +01:00
Chiachang Wang
84c2646d26 Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
 2021-04-13 08:51:12 +00:00
Chiachang Wang
4bc8b1386f Merge "Make getUid a method on UserHandle itself instead of static" 2021-04-13 08:15:47 +00:00
Chiachang Wang
fdf34500e2 Merge "Add SDK version check to skip S added API test" am: 045961b828 am: 97247ff9a3 am: 38b1591c16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I0cdc2e50246204925590ba556b6b67a7499140ee
 2021-04-13 06:59:05 +00:00
Chiachang Wang
38b1591c16 Merge "Add SDK version check to skip S added API test" am: 045961b828 am: 97247ff9a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I057a0d7c6a8697e301f6aa1b37088140d0cc8bb6
 2021-04-13 06:02:20 +00:00
Chiachang Wang
97247ff9a3 Merge "Add SDK version check to skip S added API test" am: 045961b828 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
 2021-04-13 05:17:53 +00:00
Chiachang Wang
dc1bfe31c4 Extend framework-connectivity.impl visibility to more test 
Allow captive portal tests to use hidden connectivity methods.

Bug: 182859030
Test: m
Change-Id: I2c51cbefa6d56c7ec53bacfffe735fa9d14c6510
 2021-04-13 12:53:06 +08:00
Chiachang Wang
045961b828 Merge "Add SDK version check to skip S added API test" 2021-04-13 04:30:36 +00:00
Junyu Lai
314d51526b Merge "Fix nascent timer never get removed" into sc-dev 2021-04-13 03:34:49 +00:00
Chiachang Wang
d2bce7b6e3 Add SDK version check to skip S added API test 
NetworkAgentConfigTest is a part of CtsNetTestCasesLatestSdk.
It will be used in mainline test with a R build. Test will
fail with method not found error. Add a version check to skip
the S added API tests.

Test: atest NetworkAgentConfigTest in R and S device
Fix: 185151127
Change-Id: Ib372e68afa99af455eb2713c8f6f1c8ef1d4cfdf
 2021-04-13 10:18:36 +08:00
Paul Hu
0873486f3c Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev 2021-04-13 02:05:21 +00:00
Chalard Jean
11d9e1925e Merge "Fix a bug where updates of offers won't find existing offers" into sc-dev 2021-04-13 01:33:21 +00:00
Lorenzo Colitti
d57a5dd6ce Merge "Add debug logging to requestRouteToHostAddress." am: f6f74d517f am: f37ac683f9 am: 4752f8438a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671786

Change-Id: I9c0ca1c5ba545e31fdfc1e42932cf5877d845eca
 2021-04-12 15:14:57 +00:00
Chiachang Wang
9b653a7c46 Merge "Rename APIs in NetworkAgentConfig.Builder" am: 3cbfc11c93 am: d9feace234 am: 3633ac43f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320
 2021-04-12 15:14:26 +00:00
Paul Hu
c664ed197a Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33ec185c5e am: edd5b0f3a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788

Change-Id: I1d472c9cffaa0c7f35b284b97fa374b03232a7f4
 2021-04-12 15:13:48 +00:00
Lorenzo Colitti
4752f8438a Merge "Add debug logging to requestRouteToHostAddress." am: f6f74d517f am: f37ac683f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671786

Change-Id: Idfab2681aa129b9e2a699c0c89e2d0fcf36e0c73
 2021-04-12 14:48:24 +00:00
Chiachang Wang
3633ac43f6 Merge "Rename APIs in NetworkAgentConfig.Builder" am: 3cbfc11c93 am: d9feace234 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: Ia16a26e64e65687faf6303c392c4a85de52129e3
 2021-04-12 14:47:46 +00:00
Paul Hu
edd5b0f3a8 Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33ec185c5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788

Change-Id: Ib89ecce40b1361b9f74d66d7969035c7b94702e0
 2021-04-12 14:46:35 +00:00
Lorenzo Colitti
f37ac683f9 Merge "Add debug logging to requestRouteToHostAddress." am: f6f74d517f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671786

Change-Id: I87f0ab1fe739359c115fce8da250a00b5fd0242b
 2021-04-12 14:30:00 +00:00
Chiachang Wang
d9feace234 Merge "Rename APIs in NetworkAgentConfig.Builder" am: 3cbfc11c93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9
 2021-04-12 14:25:01 +00:00
Lorenzo Colitti
f6f74d517f Merge "Add debug logging to requestRouteToHostAddress." 2021-04-12 14:24:58 +00:00
Chiachang Wang
3cbfc11c93 Merge "Rename APIs in NetworkAgentConfig.Builder" 2021-04-12 14:10:46 +00:00
Paul Hu
33ec185c5e Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788

Change-Id: Ie2f0463dd064ad7363054a5c08b6e09b54eea6cb
 2021-04-12 14:04:27 +00:00
Chalard Jean
5b2817f17e Merge changes Ic4500dc8,I32477db5 into sc-dev 
* changes:
  [NS12] Address comments on NS09
  [NS11] Fix yieldToBadWifi over the policy scoring
 2021-04-12 12:41:17 +00:00
Chalard Jean
f136443be0 Fix a bug where updates of offers won't find existing offers 
.equals() only work on cross-process Binder instances if casted to
a Binder instance first.

Bug: 184281544
Test: ConnectivityServiceTest. CTS test for this specific issue to come
Change-Id: I7b9e0df21a3cca59659867a75792289ddee2f1d7
 2021-04-12 19:48:24 +09:00
Chalard Jean
282037c2f0 [NS12] Address comments on NS09 
Test: ConnectivityServiceTest
Fixes: 184507247
Change-Id: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022
 2021-04-12 10:20:27 +00:00
Chalard Jean
1fc552984a [NS11] Fix yieldToBadWifi over the policy scoring 
This doesn't reactivate the test because it's not yet fixed over int
scoring.

Bug: 184834350
Test: Remove @Ignore and run testAvoidBadWifi
Change-Id: I32477db52eb50faabc499fa68e24ba07577782aa
 2021-04-12 10:19:57 +00:00
Chiachang Wang
3d1e89d298 Rename APIs in NetworkAgentConfig.Builder 
As API review feedback, rename disableProvisioningNotification()
to setEnabledProvisioningNotification and disableNat64Detection()
to setEnabledNat64Detection. Also, update code in caller side
accordingly.

Bug: 184735772
Test: make update-api ; atest FrameworksNetTests
Change-Id: If7305634863d1503c967e5593ebd0c8af2174bea
 2021-04-12 17:27:47 +08:00
paulhu
7fafd1827f Remove TcpRepairWindow from module-lib API 
Both TcpRepairWindow and TcpKeepaliveController(user) are in the
connectivity module, so TcpRepairWindow doesn't need to be
the module-lib API. Thus, remove TcpRepairWindow from
module-lib API.

Bug: 172183305
Test: m update-api
Change-Id: I8fde726f8ad73637e6deab69ea83b3699bb2cf45
 2021-04-12 14:26:55 +08:00
James Mattis
2066a2dc84 Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6 am: 3842f94fe3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666340

Change-Id: I123342002b462567174960aa30d1bc4727a8cec7
 2021-04-09 17:54:44 +00:00
James Mattis
3842f94fe3 Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666340

Change-Id: Ibc8b620025d5d61d34034f29e6f50d48f30b9b34
 2021-04-09 17:07:33 +00:00