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

10064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rambo Wang
ddd48e7175 Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: c19bf4fb3f am: a0cc785ec6 am: 17848cc87c 
Change-Id: I77d3be7e44ce688e9bcbd189f083c8a46ccd57ac
 2020-04-30 23:10:02 +00:00
Automerger Merge Worker
0c874453e8 Merge "Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: c19bf4fb3f am: d1aff7bde8" into rvc-d1-dev-plus-aosp am: cb4807f190 
Change-Id: I5c6757694e0a53f49043992a9da1da35739ea1b8
 2020-04-30 23:09:00 +00:00
Rambo Wang
17848cc87c Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: c19bf4fb3f am: a0cc785ec6 
Change-Id: I7ec6ed34e2d24391ae050bf10fbce46363a4d447
 2020-04-30 22:50:04 +00:00
Rambo Wang
9b4cb3aaf3 Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: c19bf4fb3f am: d1aff7bde8 
Change-Id: If62e7535d1417ceb0b2869007b87e37b34325972
 2020-04-30 22:49:08 +00:00
Rambo Wang
a0cc785ec6 Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: c19bf4fb3f 
Change-Id: I84be6ef46eb2e99749a86f24304555bff51ebfe6
 2020-04-30 22:40:29 +00:00
Rambo Wang
d1aff7bde8 Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev am: c19bf4fb3f 
Change-Id: If7fb76656075d1b54320902b69882a8fd64bfc12
 2020-04-30 22:39:37 +00:00
Rambo Wang
c19bf4fb3f Merge "Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied" into rvc-dev 2020-04-30 22:23:13 +00:00
Benedict Wong
f2b65ac39d [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 89ff63b804 -s ours am: d5f65c02bc -s ours am: 9d780e2981 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 0fff1ed7b9 is in history

Change-Id: I346edfe6e469122af6ce35fe28ac27339207e34d
 2020-04-30 18:25:35 +00:00
Benedict Wong
ee5a680bef [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 89ff63b804 am: 1d3126b526 -s ours am: 79e27d785b -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 8e3914c162 is in history

Change-Id: I124d1358224e6f08aa209b6683d1b716a68bbc69
 2020-04-30 18:25:04 +00:00
Benedict Wong
9d780e2981 [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 89ff63b804 -s ours am: d5f65c02bc -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 0fff1ed7b9 is in history

Change-Id: Ia983a0ef88d9b73920b14ea08a78e0ef542b8e1a
 2020-04-30 18:06:04 +00:00
Benedict Wong
79e27d785b [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 89ff63b804 am: 1d3126b526 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 8e3914c162 is in history

Change-Id: I66a87a9180fed5faa463e3af7f4db529ceb2dab5
 2020-04-30 18:05:19 +00:00
Benedict Wong
1d3126b526 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 89ff63b804 
Change-Id: I5c53eb9dcfc7d858e40f68cf20ddb684980ebaef
 2020-04-30 17:40:55 +00:00
Benedict Wong
d5f65c02bc [automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 89ff63b804 -s ours 
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 8e3914c162 is in history

Change-Id: I91f2a1820666357bffc974b0eab4e156e5d011a5
 2020-04-30 17:40:38 +00:00
Benedict Wong
89ff63b804 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev 2020-04-30 17:29:29 +00:00
Rambo Wang
c914d1e030 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bf1206f8fa am: c00993f9c8 am: dae8532479 am: ebb14d5205 
Change-Id: I342fd29e270f2269ef71dbd5b40edb24bf24321e
 2020-04-30 16:17:42 +00:00
Rambo Wang
ebb14d5205 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bf1206f8fa am: c00993f9c8 am: dae8532479 
Change-Id: I670338e67a45d90593aedad2ddf3a0983d4c1b26
 2020-04-30 15:52:41 +00:00
Rambo Wang
dae8532479 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bf1206f8fa am: c00993f9c8 
Change-Id: I80164890061f1f3ba6900e6f5e73e3bc6fc04b5c
 2020-04-30 15:31:31 +00:00
Rambo Wang
c00993f9c8 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: bf1206f8fa 
Change-Id: Ia4f99dcf6c86a356c1490b6500dd5e5016ff7257
 2020-04-30 15:19:24 +00:00
Rambo Wang
bf1206f8fa Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" 2020-04-30 15:07:18 +00:00
Rambo Wang
f3508769ea 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
2284da846b [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: cc9f73cad3 -s ours am: 4d1c237b8c -s ours am: f3b563809d -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 f577197908 is in history

Change-Id: Ic12643bc9442df4f42ee4de96f42a15992f15828
 2020-04-30 06:59:54 +00:00
Remi NGUYEN VAN
2033d0ea3c [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: cc9f73cad3 am: 4193f33575 -s ours am: aed3b8e4dd -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 9b647ca69a is in history

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

Change-Id: Ic713dcd96b22fb286f916ebe8bdb8b513ff5d551
 2020-04-30 06:41:23 +00:00
Remi NGUYEN VAN
aed3b8e4dd [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: cc9f73cad3 am: 4193f33575 -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 9b647ca69a is in history

Change-Id: I1b2900d70d1c326428f51f0c4ed28049aabd33ef
 2020-04-30 06:41:05 +00:00
Remi NGUYEN VAN
4193f33575 Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: cc9f73cad3 
Change-Id: I58b6863e5f8417368c7cd83edc487404d5156e99
 2020-04-30 06:19:07 +00:00
Remi NGUYEN VAN
4d1c237b8c [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: cc9f73cad3 -s ours 
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 9b647ca69a is in history

Change-Id: I34895c81e5abfe3baf155582cf557ce909af5965
 2020-04-30 06:18:35 +00:00
Benedict Wong
0fff1ed7b9 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 94e1c08a9ad4b0ff17e0f3a77fff0d3364040ba5)
 2020-04-29 23:05:35 -07:00
Remi NGUYEN VAN
cc9f73cad3 Merge "Address comments on NetworkStack AIDL v6" into rvc-dev 2020-04-30 06:02:32 +00:00
TreeHugger Robot
6112338766 [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b am: dc73da17af -s ours am: 222506ec1a -s ours 
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 bd16241678 is in history

Change-Id: I76fdf4ba3530b547883bd46c43cc71c51a70eded
 2020-04-30 04:49:59 +00:00
TreeHugger Robot
cf30e3e05b [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours am: 2834dea9ca -s ours am: 9276c01430 -s ours 
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 1d5c290e38 is in history

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

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

Change-Id: I4fe424305ea9af7c41033bd6cb7f52ef8f30c37a
 2020-04-30 04:35:04 +00:00
TreeHugger Robot
dc73da17af 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
2834dea9ca [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 1d5c290e38 is in history

Change-Id: I89ff9147f99b03c5bd1e7f5aa34c5968cfbfc18e
 2020-04-30 04:20:28 +00:00
TreeHugger Robot
8a32f93872 [automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e -s ours am: aedd37a309 -s ours am: e8869e1aee -s ours 
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 3cb1e03082 is in history

Change-Id: I600daca81f430b97b4d56b7a9769000be16b3b8e
 2020-04-30 04:19:29 +00:00
TreeHugger Robot
e4c59ebeaf [automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe712700e am: be93c81ba8 -s ours am: 6c043d219b -s ours 
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 88fa813bd7 is in history

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

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

Change-Id: Ic2ac01065a112c54e0aa0de91008883c8572d5a6
 2020-04-30 03:55:16 +00:00
TreeHugger Robot
be93c81ba8 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
aedd37a309 [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 88fa813bd7 is in history

Change-Id: Ib69e3996287d6469e2baa5fa6a3837d2e01bc197
 2020-04-30 03:34:36 +00:00
Chiachang Wang
bd16241678 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
3cb1e03082 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
242cfad7b2 Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4 am: 6c3df199cd am: e19fcdf1a5 
Change-Id: I1c2352574ce92f2f030a01394ec4d35860053e73
 2020-04-29 09:56:55 +00:00
Chiachang Wang
e19fcdf1a5 Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4 am: 6c3df199cd 
Change-Id: Iff7435b20b830357a53f4773b211cd5ddc911ebd
 2020-04-29 09:42:14 +00:00
Chiachang Wang
6c3df199cd Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4 
Change-Id: I85b8798fc82873d22c338937bb61092fbde259e6
 2020-04-29 09:24:10 +00:00
Chiachang Wang
098a24b8d4 Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 
Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4
 2020-04-29 09:08:45 +00:00
Chiachang Wang
7752ddf0b7 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
1d5c290e38 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
88fa813bd7 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
5afaa9119c Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: eb8393aa09 am: a7c8c64284 am: 60b787f922 am: 6cdb42012f 
Change-Id: Id2ab17f49802d9213c255e0a485182edec25c88c
 2020-04-28 19:07:23 +00:00