LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,061 Commits 2 Branches 0 Tags
5eb9880d2bd77b8e2ccb58dfb2fafebd74ec2fb5
Commit Graph

10061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
5eb9880d2b Merge "Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: 7db902bf07 am: 3492cce255" into rvc-d1-dev-plus-aosp am: cb4807f190 
Change-Id: I5c6757694e0a53f49043992a9da1da35739ea1b8
 2020-04-30 23:09:00 +00:00
Rambo Wang
ae7f1b1d58 Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: 7db902bf07 am: 3492cce255 
Change-Id: If62e7535d1417ceb0b2869007b87e37b34325972
 2020-04-30 22:49:08 +00:00
Rambo Wang
3492cce255 Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: 7db902bf07 
Change-Id: If7fb76656075d1b54320902b69882a8fd64bfc12
 2020-04-30 22:39:37 +00:00
Rambo Wang
7db902bf07 Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev 2020-04-30 22:23:13 +00:00
Benedict Wong
f694d9ca7c [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: b3ce2bb050 -s ours am: 617ae9e147 -s ours am: 12457ad892 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 22d1b7df13 is in history

Change-Id: I346edfe6e469122af6ce35fe28ac27339207e34d
 2020-04-30 18:25:35 +00:00
Benedict Wong
77c24764f5 [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: b3ce2bb050 am: 8464ec1299 -s ours am: 5d1a95b3d4 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 e2a2a10e93 is in history

Change-Id: I124d1358224e6f08aa209b6683d1b716a68bbc69
 2020-04-30 18:25:04 +00:00
Benedict Wong
12457ad892 [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: b3ce2bb050 -s ours am: 617ae9e147 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 22d1b7df13 is in history

Change-Id: Ia983a0ef88d9b73920b14ea08a78e0ef542b8e1a
 2020-04-30 18:06:04 +00:00
Benedict Wong
5d1a95b3d4 [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: b3ce2bb050 am: 8464ec1299 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 e2a2a10e93 is in history

Change-Id: I66a87a9180fed5faa463e3af7f4db529ceb2dab5
 2020-04-30 18:05:19 +00:00
Benedict Wong
8464ec1299 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: b3ce2bb050 
Change-Id: I5c53eb9dcfc7d858e40f68cf20ddb684980ebaef
 2020-04-30 17:40:55 +00:00
Benedict Wong
617ae9e147 [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: b3ce2bb050 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 e2a2a10e93 is in history

Change-Id: I91f2a1820666357bffc974b0eab4e156e5d011a5
 2020-04-30 17:40:38 +00:00
Benedict Wong
b3ce2bb050 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev 2020-04-30 17:29:29 +00:00
Rambo Wang
d72d906ecd Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bb82d3d2f0 am: 5e75c447f8 am: 19082fb048 am: ac7a8235a4 
Change-Id: I342fd29e270f2269ef71dbd5b40edb24bf24321e
 2020-04-30 16:17:42 +00:00
Rambo Wang
ac7a8235a4 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bb82d3d2f0 am: 5e75c447f8 am: 19082fb048 
Change-Id: I670338e67a45d90593aedad2ddf3a0983d4c1b26
 2020-04-30 15:52:41 +00:00
Rambo Wang
19082fb048 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bb82d3d2f0 am: 5e75c447f8 
Change-Id: I80164890061f1f3ba6900e6f5e73e3bc6fc04b5c
 2020-04-30 15:31:31 +00:00
Rambo Wang
5e75c447f8 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bb82d3d2f0 
Change-Id: Ia4f99dcf6c86a356c1490b6500dd5e5016ff7257
 2020-04-30 15:19:24 +00:00
Rambo Wang
bb82d3d2f0 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" 2020-04-30 15:07:18 +00:00
Rambo Wang
4d1afeb672 Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier 
MatchAllNetworkSpecifier is a subclass of NetworkSpecifer. The method
satisfiedBy should be renamed to canBeSatisfiedBy together with other
subclass of NetworkSpecifer in b/152238712.

Add annotation @Overide for the method to make sure it will not get
ignored when refactor in the future.

Bug: 154956584
Test: atest android.net.MatchAllNetworkSpecifierTest
Change-Id: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7
 2020-04-30 15:06:35 +00:00
Remi NGUYEN VAN
d91843ce4c [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 -s ours am: ba26c4d385 -s ours am: c75c8ccf0c -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 4eebd7214f is in history

Change-Id: Ic12643bc9442df4f42ee4de96f42a15992f15828
 2020-04-30 06:59:54 +00:00
Remi NGUYEN VAN
8845322d14 [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 am: a2191260ad -s ours am: d34db354ba -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history

Change-Id: I16e0647e1ed8418f2a5d5634c1cce8d4df84ceea
 2020-04-30 06:59:28 +00:00
Remi NGUYEN VAN
c75c8ccf0c [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 -s ours am: ba26c4d385 -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 4eebd7214f is in history

Change-Id: Ic713dcd96b22fb286f916ebe8bdb8b513ff5d551
 2020-04-30 06:41:23 +00:00
Remi NGUYEN VAN
d34db354ba [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 am: a2191260ad -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history

Change-Id: I1b2900d70d1c326428f51f0c4ed28049aabd33ef
 2020-04-30 06:41:05 +00:00
Remi NGUYEN VAN
a2191260ad Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 
Change-Id: I58b6863e5f8417368c7cd83edc487404d5156e99
 2020-04-30 06:19:07 +00:00
Remi NGUYEN VAN
ba26c4d385 [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history

Change-Id: I34895c81e5abfe3baf155582cf557ce909af5965
 2020-04-30 06:18:35 +00:00
Benedict Wong
22d1b7df13 Add filtering for IPsec algorithms in IKEv2 VPNs 
This commit adds support for validating and filtering IPsec algorithms.
Without a public API exposing IKEv2 algorithms (and their respective
public APIs), the allowedAlgorithms can only filter the proposals for
IPsec (Child) SA algorithms.

Additionally, this removes the HMAC_SHA1 from the IKE SA's integrity
algorithm proposals due to insecurity

Bug: 153701879
Test: FrameworksNetTests passing, new tests added
Change-Id: I7e61a1612692db275b751330af5bacbf86836a8c
Merged-In: I7e61a1612692db275b751330af5bacbf86836a8c
(cherry picked from commit a435ff8bf8)
 2020-04-29 23:05:35 -07:00
Remi NGUYEN VAN
3551e00976 Merge "Address comments on NetworkStack AIDL v6" into rvc-dev 2020-04-30 06:02:32 +00:00
TreeHugger Robot
cb7bcd3e16 [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b am: 89036a2ee6 -s ours am: 43b57333c7 -s ours 
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 61d8a11ea9 is in history

Change-Id: I76fdf4ba3530b547883bd46c43cc71c51a70eded
 2020-04-30 04:49:59 +00:00
TreeHugger Robot
751b0ec50f [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours am: d8a94b47d9 -s ours am: 3f642b5f99 -s ours 
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history

Change-Id: I60a7c6b86c43ae1e57e98f2a6831289854b77274
 2020-04-30 04:49:06 +00:00
TreeHugger Robot
43b57333c7 [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b am: 89036a2ee6 -s ours 
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history

Change-Id: I18fb4a1783592319fd0e90ce76eb9c14636652b2
 2020-04-30 04:35:17 +00:00
TreeHugger Robot
3f642b5f99 [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours am: d8a94b47d9 -s ours 
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history

Change-Id: I4fe424305ea9af7c41033bd6cb7f52ef8f30c37a
 2020-04-30 04:35:04 +00:00
TreeHugger Robot
89036a2ee6 Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b 
Change-Id: I0b1a9b7ffc65bfa6c784ec215e64371ab8d14e93
 2020-04-30 04:20:40 +00:00
TreeHugger Robot
d8a94b47d9 [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours 
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history

Change-Id: I89ff9147f99b03c5bd1e7f5aa34c5968cfbfc18e
 2020-04-30 04:20:28 +00:00
TreeHugger Robot
2ea2b900a5 [automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e -s ours am: 5e7d209cb5 -s ours am: 0fce670efc -s ours 
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 a92a825412 is in history

Change-Id: I600daca81f430b97b4d56b7a9769000be16b3b8e
 2020-04-30 04:19:29 +00:00
TreeHugger Robot
280c4adfad [automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e am: 28341da5f1 -s ours am: 6c836011cf -s ours 
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history

Change-Id: Ia044a2c0e67e73e20870bba96eb84907f8f7bbe7
 2020-04-30 04:18:54 +00:00
TreeHugger Robot
0fce670efc [automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e -s ours am: 5e7d209cb5 -s ours 
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history

Change-Id: Ie788afa31c9bbc975ca2b580a9f35d369c021fbe
 2020-04-30 03:55:38 +00:00
TreeHugger Robot
6c836011cf [automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e am: 28341da5f1 -s ours 
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history

Change-Id: Ic2ac01065a112c54e0aa0de91008883c8572d5a6
 2020-04-30 03:55:16 +00:00
TreeHugger Robot
28341da5f1 Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e 
Change-Id: I613235e39111132b5627c5d72c2b2f589d5c9641
 2020-04-30 03:35:14 +00:00
TreeHugger Robot
5e7d209cb5 [automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e -s ours 
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history

Change-Id: Ib69e3996287d6469e2baa5fa6a3837d2e01bc197
 2020-04-30 03:34:36 +00:00
Chiachang Wang
61d8a11ea9 Filter debug entries for each vpn 
NetworkStats calculation needs to filter out debug entries to
prevent over counting. While NetworkStatsFactory migrates data
usage over a VPN to the TUN network, NetworkStatsFactory does
not filter out debug entries per vpn which will cause debug
entries left and cause exception.

Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
      and verify no exception
Change-Id: I3525edc385b07858b48c7add2d331c4b5a2e84ad
Merged-In: I3525edc385b07858b48c7add2d331c4b5a2e84ad
 2020-04-30 02:39:15 +00:00
Chiachang Wang
a92a825412 Add test prefix into test cases 
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
Change-Id: I6e18915e383ac20072cb238d0136d7a8e4ceb811
Merged-In: I6e18915e383ac20072cb238d0136d7a8e4ceb811
 2020-04-30 02:38:18 +00:00
Chiachang Wang
bae528a933 Merge changes I3525edc3,I6e18915e am: c2e56739dc am: 11ed6b71d4 am: 15694d6d85 am: 8a29060fb7 
Change-Id: I1c2352574ce92f2f030a01394ec4d35860053e73
 2020-04-29 09:56:55 +00:00
Chiachang Wang
8a29060fb7 Merge changes I3525edc3,I6e18915e am: c2e56739dc am: 11ed6b71d4 am: 15694d6d85 
Change-Id: Iff7435b20b830357a53f4773b211cd5ddc911ebd
 2020-04-29 09:42:14 +00:00
Chiachang Wang
15694d6d85 Merge changes I3525edc3,I6e18915e am: c2e56739dc am: 11ed6b71d4 
Change-Id: I85b8798fc82873d22c338937bb61092fbde259e6
 2020-04-29 09:24:10 +00:00
Chiachang Wang
11ed6b71d4 Merge changes I3525edc3,I6e18915e am: c2e56739dc 
Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4
 2020-04-29 09:08:45 +00:00
Chiachang Wang
c2e56739dc Merge changes I3525edc3,I6e18915e 
* changes:
  Filter debug entries for each vpn
  Add test prefix into test cases
 2020-04-29 08:43:02 +00:00
Chiachang Wang
aec798b639 Filter debug entries for each vpn 
NetworkStats calculation needs to filter out debug entries to
prevent over counting. While NetworkStatsFactory migrates data
usage over a VPN to the TUN network, NetworkStatsFactory does
not filter out debug entries per vpn which will cause debug
entries left and cause exception.

Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
      and verify no exception
Change-Id: I3525edc385b07858b48c7add2d331c4b5a2e84ad
 2020-04-29 15:07:45 +08:00
Chiachang Wang
5c8e3be449 Add test prefix into test cases 
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
Change-Id: I6e18915e383ac20072cb238d0136d7a8e4ceb811
 2020-04-29 13:44:50 +08:00
Benedict Wong
1cf869991f Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05 am: ebb01b6fd8 am: 8ee3575ab8 am: c1e107e076 
Change-Id: Id2ab17f49802d9213c255e0a485182edec25c88c
 2020-04-28 19:07:23 +00:00
Benedict Wong
c1e107e076 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05 am: ebb01b6fd8 am: 8ee3575ab8 
Change-Id: Ic413b4638d37da94fa32ec2f81f9c570442be15a
 2020-04-28 18:44:53 +00:00
Benedict Wong
8ee3575ab8 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05 am: ebb01b6fd8 
Change-Id: I7ef93d318b795754eea3511caf7c3ae9187a88b2
 2020-04-28 18:17:10 +00:00
Benedict Wong
ebb01b6fd8 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05 
Change-Id: Ib3e7bea4ad17eaf0b64bc157ed682c672a17f79a
 2020-04-28 17:59:07 +00:00