LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,699 Commits 2 Branches 0 Tags
34a1e6bfd2b5c4480cdf6dffd49ce4e172a8809c
Commit Graph

9699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
34a1e6bfd2 Merge "Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 am: b9cd996758" into rvc-dev-plus-aosp am: 8eec601b70 am: 91c8d80262 am: baeca5cf20 
Change-Id: Ie61a241b2b80ea12c60a58c5e26b5af34e02a5ef
 2020-04-02 18:52:50 +00:00
Junyu Lai
6f23d26755 Merge changes from topic "sp26-networkstats-cts" am: 78bae7423a am: e040b441b0 am: b8886a3399 am: dd89bec29f am: c73c774659 
Change-Id: I133100effc8a0f6318b2574f09f3da416e7b5107
 2020-04-02 18:36:31 +00:00
junyulai
7367523ccb [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8 am: 61860a023a am: eb6af3e20c am: 0f2ee895bb am: 6c615f7f0a 
Change-Id: I6397ef1dd483d0d2f62cfcf044fa6b89b3c39982
 2020-04-02 18:36:24 +00:00
Automerger Merge Worker
baeca5cf20 Merge "Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 am: b9cd996758" into rvc-dev-plus-aosp am: 8eec601b70 am: 91c8d80262 
Change-Id: Ie7791b056768052746247a1bdc3eb00b6d727785
 2020-04-02 05:30:29 +00:00
Automerger Merge Worker
91c8d80262 Merge "Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 am: b9cd996758" into rvc-dev-plus-aosp am: 8eec601b70 
Change-Id: I5caa0ec3eb4e3a91c2b088ba8094d1bda0e1a23f
 2020-04-02 05:13:04 +00:00
Lorenzo Colitti
8e52c6d4be Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 am: b9cd996758 
Change-Id: I9230f1a73698344eb40ae3e0ebc5d73cc259f2d0
 2020-04-02 04:50:41 +00:00
Lorenzo Colitti
b9cd996758 Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 
Change-Id: I5267b567e1b9babe3bc95d2984262dc864681a2d
 2020-04-02 04:32:04 +00:00
Lorenzo Colitti
f198a43744 Merge "Only apply VPN isolation if it's fully routed" 2020-04-02 04:10:12 +00:00
Junyu Lai
c73c774659 Merge changes from topic "sp26-networkstats-cts" am: 78bae7423a am: e040b441b0 am: b8886a3399 am: dd89bec29f 
Change-Id: I90f366660e6b4d25972b4d3708a9a05d0678bc60
 2020-04-02 03:35:39 +00:00
junyulai
6c615f7f0a [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8 am: 61860a023a am: eb6af3e20c am: 0f2ee895bb 
Change-Id: Ie5acbb0d825e210c5217517935ef816a8dfd666e
 2020-04-02 03:35:35 +00:00
Junyu Lai
dd89bec29f Merge changes from topic "sp26-networkstats-cts" am: 78bae7423a am: e040b441b0 am: b8886a3399 
Change-Id: I0dc9884b3f36ecc6678d741d74e5c85ac0756378
 2020-04-02 03:11:17 +00:00
junyulai
0f2ee895bb [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8 am: 61860a023a am: eb6af3e20c 
Change-Id: Ice87baf7326ad333b611a348b3bceebe71d0858e
 2020-04-02 03:11:14 +00:00
Junyu Lai
b8886a3399 Merge changes from topic "sp26-networkstats-cts" am: 78bae7423a am: e040b441b0 
Change-Id: I0964b1752acbba767135c960aba12f169b3f852c
 2020-04-02 02:40:53 +00:00
junyulai
eb6af3e20c [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8 am: 61860a023a 
Change-Id: I388b1d3677d362da2595739913880efa9a643a03
 2020-04-02 02:40:42 +00:00
Junyu Lai
e040b441b0 Merge changes from topic "sp26-networkstats-cts" am: 78bae7423a 
Change-Id: I124f0def6fdaad8f1726df23edc87b6aa7856586
 2020-04-02 02:21:26 +00:00
junyulai
61860a023a [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8 
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
 2020-04-02 02:21:20 +00:00
Junyu Lai
78bae7423a Merge changes from topic "sp26-networkstats-cts" 
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
 2020-04-02 02:00:59 +00:00
Chiachang Wang
447a0fc4ce [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours am: ac1b0aceae -s ours am: 1746031345 -s ours am: 3e444a10be -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 9e16b29fab is in history

Change-Id: I8b08ef41e2af5e58145bbbf9da7274306544338f
 2020-04-01 09:53:22 +00:00
Chiachang Wang
24574e4b67 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 am: c4e9983ed6 -s ours am: 7ecde9f569 -s ours am: ad6a2c790b -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 70dd24ba21 is in history

Change-Id: Ieba549ad822c966b1459efe263aff458b8430a03
 2020-04-01 09:53:01 +00:00
Chiachang Wang
3e444a10be [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours am: ac1b0aceae -s ours am: 1746031345 -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 9e16b29fab is in history

Change-Id: Ibe9b121d440ef7b2efa5079ede8eee6c8d5c80a7
 2020-04-01 09:39:48 +00:00
Chiachang Wang
ad6a2c790b [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 am: c4e9983ed6 -s ours am: 7ecde9f569 -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 70dd24ba21 is in history

Change-Id: Ibd226fa45b7a09db853cb6ae7f0df0f1b40d84ba
 2020-04-01 09:39:35 +00:00
Chiachang Wang
1746031345 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours am: ac1b0aceae -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 70dd24ba21 is in history

Change-Id: I8ab7bf30792b69ec23cf28a17771ffe243abd162
 2020-04-01 09:24:08 +00:00
Chiachang Wang
7ecde9f569 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 am: c4e9983ed6 -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 70dd24ba21 is in history

Change-Id: I0b4d8e47e8900c0aaf9cee4e95956401e3087b30
 2020-04-01 09:23:54 +00:00
Chiachang Wang
ac1b0aceae [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 70dd24ba21 is in history

Change-Id: I728c5080b92ffa7c8c2524f2430252af1faee963
 2020-04-01 09:11:18 +00:00
Chiachang Wang
c4e9983ed6 Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 
Change-Id: Iea5f995291bdbe3081c8f7ded5bf4f3f50e6c7d1
 2020-04-01 09:11:13 +00:00
junyulai
6d745cc0a8 [SP26.2] add a method in NetworkStats that removes empty entries 
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692
Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
 2020-04-01 16:46:08 +08:00
junyulai
169246fd17 [SP26] add CTS for NetworkStats 
Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: I690704b43cfd16de70c4c83916f6d750cf613f67
 2020-04-01 16:46:08 +08:00
Rubin Xu
fa429013a0 Only apply VPN isolation if it's fully routed 
VPN is considered fully routed if both IPv4 and IPv6 have
either a default route or a prohibit route.

Bug: 145332510
Test: atest FrameworksNetTests
Change-Id: I59cf48552bca98092d1212e3d718fd420add5458
 2020-04-01 09:36:29 +01:00
Aaron Huang
49e31ad0e2 [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: e6d2e6c4ac am: 18483161bc -s ours am: 01e197beba -s ours am: 13834830ea -s ours am: caf56cf0fd -s ours 
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 4c7368a340 is in history

Change-Id: I56d59884df699e4fbadf1213cc57e194ab7e9e59
 2020-04-01 06:42:44 +00:00
Chalard Jean
51cba7ae58 [automerger skipped] Update NetworkAgentConfig API for council comments am: e5b9e82f86 am: 0b32491fc4 -s ours am: 89469aba2e -s ours am: fc686c27d0 -s ours am: e23c5b8d68 -s ours 
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 74fe1c7205 is in history

Change-Id: I635f9ed5eafead8a26a92da09f8fac8a12133c4a
 2020-04-01 06:42:38 +00:00
Chalard Jean
5db81e67e2 [automerger skipped] Update the NetworkAgent API for council comments am: 7fe99f5dfe am: 39709833c2 -s ours am: 6e73dd4adc -s ours am: 2a8cf6e8e9 -s ours am: 84c064b8e4 -s ours 
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 cb4711edd8 is in history

Change-Id: I553a7e005516185f1c449487009da8ea8e6402cc
 2020-04-01 06:42:31 +00:00
Aaron Huang
caf56cf0fd [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: e6d2e6c4ac am: 18483161bc -s ours am: 01e197beba -s ours am: 13834830ea -s ours 
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 4c7368a340 is in history

Change-Id: Ie2735be3c501679f172c2aa5baf58595861ec2e6
 2020-04-01 06:17:52 +00:00
Chalard Jean
e23c5b8d68 [automerger skipped] Update NetworkAgentConfig API for council comments am: e5b9e82f86 am: 0b32491fc4 -s ours am: 89469aba2e -s ours am: fc686c27d0 -s ours 
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 74fe1c7205 is in history

Change-Id: If04f1cfc701e94217db04639817db828f2360525
 2020-04-01 06:17:49 +00:00
Chalard Jean
84c064b8e4 [automerger skipped] Update the NetworkAgent API for council comments am: 7fe99f5dfe am: 39709833c2 -s ours am: 6e73dd4adc -s ours am: 2a8cf6e8e9 -s ours 
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 cb4711edd8 is in history

Change-Id: I1bda6e261c0d9ccfa02169221364a06b3246b97c
 2020-04-01 06:17:44 +00:00
Aaron Huang
13834830ea [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: e6d2e6c4ac am: 18483161bc -s ours am: 01e197beba -s ours 
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 4c7368a340 is in history

Change-Id: Ieb1eb1874b6160999da847557dac5e8d4a184e3f
 2020-04-01 06:02:52 +00:00
Chalard Jean
fc686c27d0 [automerger skipped] Update NetworkAgentConfig API for council comments am: e5b9e82f86 am: 0b32491fc4 -s ours am: 89469aba2e -s ours 
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 74fe1c7205 is in history

Change-Id: I3c2a67c8c613fb6a7bc37d004b6c4a3f44cd761c
 2020-04-01 06:02:51 +00:00
Chalard Jean
2a8cf6e8e9 [automerger skipped] Update the NetworkAgent API for council comments am: 7fe99f5dfe am: 39709833c2 -s ours am: 6e73dd4adc -s ours 
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 cb4711edd8 is in history

Change-Id: I1c5f6c675417272217a4c15bdae2c8f9f5c35d5a
 2020-04-01 06:02:48 +00:00
Aaron Huang
01e197beba [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: e6d2e6c4ac am: 18483161bc -s ours 
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 4c7368a340 is in history

Change-Id: Ic318324c0424d0ad106b0c92c1cb55ba616c6b2b
 2020-04-01 05:58:30 +00:00
Chalard Jean
89469aba2e [automerger skipped] Update NetworkAgentConfig API for council comments am: e5b9e82f86 am: 0b32491fc4 -s ours 
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 74fe1c7205 is in history

Change-Id: Icf2ec01fe46cf905b2636d064fd68e2ff9e546e7
 2020-04-01 05:58:23 +00:00
Chalard Jean
6e73dd4adc [automerger skipped] Update the NetworkAgent API for council comments am: 7fe99f5dfe am: 39709833c2 -s ours 
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 cb4711edd8 is in history

Change-Id: Iac85b28ac13c794999110e7cd54f1816dd298967
 2020-04-01 05:58:14 +00:00
Aaron Huang
18483161bc Merge changes from topics "networkagent_api", "networkprovider_api" am: e6d2e6c4ac 
Change-Id: I553a53bc4612fc367591738d9669e354730fdacc
 2020-04-01 05:47:04 +00:00
Chalard Jean
0b32491fc4 Update NetworkAgentConfig API for council comments am: e5b9e82f86 
Change-Id: I195c50ee1db2dd26b7c06f4ecbd6dbccc38895ef
 2020-04-01 05:46:58 +00:00
Chalard Jean
39709833c2 Update the NetworkAgent API for council comments am: 7fe99f5dfe 
Change-Id: I1337011740d2c34f886a6d2975bd3da24f371bb8
 2020-04-01 05:46:50 +00:00
Aaron Huang
e6d2e6c4ac Merge changes from topics "networkagent_api", "networkprovider_api" 
* changes:
  Update the NetworkProvider API for council comments
  Update NetworkAgentConfig API for council comments
  Update the NetworkAgent API for council comments
 2020-04-01 05:33:28 +00:00
Automerger Merge Worker
17f2e90649 [automerger skipped] Merge changes from topic "am-62cf96e558d742ccab9d58387a2cabd1" into rvc-d1-dev-plus-aosp am: 4d977980c6 -s ours am: ba4bafb27c -s ours 
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 f98655069e is in history

Change-Id: I096fee2e61b3932b20ecef1b4227e4975714c2a5
 2020-04-01 02:12:58 +00:00
Chiachang Wang
9e16b29fab Update constructor of NetworkMonitor 
Remove redundant parameter.

Bug: 152374582
Test: m -j40 ; atest FrameworksNetIntegrationTests
Merged-In: I3a636f0ea5145ac4435e06a9827bb8e01862542d
Change-Id: I3a636f0ea5145ac4435e06a9827bb8e01862542d
 2020-04-01 02:12:32 +00:00
Cody Kesting
3c198d5543 [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: aa33c8ca7a -s ours am: fecedcfef7 -s ours am: 58c6e7a361 -s ours am: 5fb1fc2418 -s ours 
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 70897531b8 is in history

Change-Id: Iba8bc416046bab72a647ed672592122443234568
 2020-04-01 02:11:37 +00:00
Automerger Merge Worker
ba4bafb27c [automerger skipped] Merge changes from topic "am-62cf96e558d742ccab9d58387a2cabd1" into rvc-d1-dev-plus-aosp am: 4d977980c6 -s ours 
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 f98655069e is in history

Change-Id: Ie523c6f7c460826ae336f418edf1f2af77c041ca
 2020-04-01 02:01:00 +00:00
Cody Kesting
5fb1fc2418 [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: aa33c8ca7a -s ours am: fecedcfef7 -s ours am: 58c6e7a361 -s ours 
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 70897531b8 is in history

Change-Id: I61fdf75643e259d20b94aa3f23b76976ccddf1cf
 2020-04-01 01:59:31 +00:00
Cody Kesting
34f8fa9387 [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: aa33c8ca7a am: 3cbabe8edb -s ours 
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 70897531b8 is in history

Change-Id: Ic6ec72c3d809fab0f50a6f4b386ebf050bf60d25
 2020-04-01 01:41:34 +00:00