am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 22d1b7df13 is in history
Change-Id: I346edfe6e469122af6ce35fe28ac27339207e34d
Benedict Wongauthored and Automerger Merge Workercommited 2020-04-30 18:25:35 +00:00
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 e2a2a10e93 is in history
Change-Id: I124d1358224e6f08aa209b6683d1b716a68bbc69
Benedict Wongauthored and Automerger Merge Workercommited 2020-04-30 18:25:04 +00:00
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 22d1b7df13 is in history
Change-Id: Ia983a0ef88d9b73920b14ea08a78e0ef542b8e1a
Benedict Wongauthored and Automerger Merge Workercommited 2020-04-30 18:06:04 +00:00
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 e2a2a10e93 is in history
Change-Id: I66a87a9180fed5faa463e3af7f4db529ceb2dab5
Benedict Wongauthored and Automerger Merge Workercommited 2020-04-30 18:05:19 +00:00
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 e2a2a10e93 is in history
Change-Id: I91f2a1820666357bffc974b0eab4e156e5d011a5
Benedict Wongauthored and Automerger Merge Workercommited 2020-04-30 17:40:38 +00:00
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
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 4eebd7214f is in history
Change-Id: Ic12643bc9442df4f42ee4de96f42a15992f15828
Remi NGUYEN VANauthored and Automerger Merge Workercommited 2020-04-30 06:59:54 +00:00
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history
Change-Id: I16e0647e1ed8418f2a5d5634c1cce8d4df84ceea
Remi NGUYEN VANauthored and Automerger Merge Workercommited 2020-04-30 06:59:28 +00:00
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 4eebd7214f is in history
Change-Id: Ic713dcd96b22fb286f916ebe8bdb8b513ff5d551
Remi NGUYEN VANauthored and Automerger Merge Workercommited 2020-04-30 06:41:23 +00:00
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history
Change-Id: I1b2900d70d1c326428f51f0c4ed28049aabd33ef
Remi NGUYEN VANauthored and Automerger Merge Workercommited 2020-04-30 06:41:05 +00:00
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history
Change-Id: I34895c81e5abfe3baf155582cf557ce909af5965
Remi NGUYEN VANauthored and Automerger Merge Workercommited 2020-04-30 06:18:35 +00:00
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)
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 61d8a11ea9 is in history
Change-Id: I76fdf4ba3530b547883bd46c43cc71c51a70eded
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 04:49:59 +00:00
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history
Change-Id: I60a7c6b86c43ae1e57e98f2a6831289854b77274
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 04:49:06 +00:00
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history
Change-Id: I18fb4a1783592319fd0e90ce76eb9c14636652b2
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 04:35:17 +00:00
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history
Change-Id: I4fe424305ea9af7c41033bd6cb7f52ef8f30c37a
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 04:35:04 +00:00
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 aec798b639 is in history
Change-Id: I89ff9147f99b03c5bd1e7f5aa34c5968cfbfc18e
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 04:20:28 +00:00
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 a92a825412 is in history
Change-Id: I600daca81f430b97b4d56b7a9769000be16b3b8e
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 04:19:29 +00:00
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history
Change-Id: Ia044a2c0e67e73e20870bba96eb84907f8f7bbe7
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 04:18:54 +00:00
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history
Change-Id: Ie788afa31c9bbc975ca2b580a9f35d369c021fbe
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 03:55:38 +00:00
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history
Change-Id: Ic2ac01065a112c54e0aa0de91008883c8572d5a6
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 03:55:16 +00:00
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 5c8e3be449 is in history
Change-Id: Ib69e3996287d6469e2baa5fa6a3837d2e01bc197
TreeHugger Robotauthored and Automerger Merge Workercommited 2020-04-30 03:34:36 +00:00
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
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
Automerger Merge Worker
commited 
Rambo Wang
authored and
Android (Google) Code Review
commited 
Benedict Wong
authored and
Gerrit Code Review
commited 
Remi NGUYEN VAN
authored and
TreeHugger Robot
authored and
Chiachang Wang
commited