Commit Graph

9924 Commits

Author SHA1 Message Date
Sarah Chin
bd3f35e5b4 [automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 5581c36ff3 -s ours am: 2fcd85f62d -s ours
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 71863e9604 is in history

Change-Id: I56c31471f54180a6e49cf1a72a1793618c5bec1c
2020-05-07 06:12:55 +00:00
Sarah Chin
2fcd85f62d [automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 5581c36ff3 -s ours
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 71863e9604 is in history

Change-Id: Ie43cc7dbddd5497dfa069fac5570a7a64eddb2a1
2020-05-07 06:12:02 +00:00
Sarah Chin
5581c36ff3 Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9
Change-Id: I94eb37627875f96c7e70a5df9d273266bc4def66
2020-05-07 06:01:20 +00:00
Jack Yu
0298306ba0 Added a new capability for temporarily unmetered network.
Added a new network capability TEMOPORARILY_NOT_METERED to support
the case that a network can temporarily become unmetered. This
allows carriers to deploy unmetered 5G network. When devices
camp on 5G network, this capability will be dynamically added
to the network and will be removed once leaving 5G coverage.

Bug: 153081494
Test: Manual
Change-Id: I10e26cb0852e67f614e7b9c4e49f95e078602e21
Merged-In: I10e26cb0852e67f614e7b9c4e49f95e078602e21
2020-05-06 13:13:45 -07:00
Treehugger Robot
5ba5a0cd67 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e am: 7e92e7330c -s ours am: 75986b4623 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 c6081f9c50 is in history

Change-Id: Ia28361c12804065aa4e0729f3e6283a7f4049101
2020-05-05 12:07:17 +00:00
Treehugger Robot
75986b4623 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e am: 7e92e7330c -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 c6081f9c50 is in history

Change-Id: I44a2ee47f6a88286b28d5165c67cfd4fdbdd0152
2020-05-05 11:54:36 +00:00
Treehugger Robot
7e92e7330c Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e
Change-Id: Ifadf4ad62820c6cbf536a3984b1cf4a0b78cbc31
2020-05-05 11:32:31 +00:00
junyulai
d33735c952 [SM10] Adopt helper class to monitor RAT type change per sub
Test: atest NetworkStatsServiceTest
Bug: 146415925
Change-Id: I45c3aa9046b316c8cd0943543d620a22e4afefd1
Merged-In: I45c3aa9046b316c8cd0943543d620a22e4afefd1
(cherry picked from commit 219faff07bdc58c14fe58fc525e86383db1f8167)
2020-05-05 18:37:29 +08:00
Remi NGUYEN VAN
59e1240e94 Merge "Use the new NetworkStackConnector constructor" am: 062e45d48c am: d04dcdcea0 am: d624b40eaf
Change-Id: I6c8c0455cfd96f653e1080fc0b7265374e3a418d
2020-05-01 04:57:35 +00:00
Remi NGUYEN VAN
d624b40eaf Merge "Use the new NetworkStackConnector constructor" am: 062e45d48c am: d04dcdcea0
Change-Id: I6bf23b1716706aaa757170ec3a60062ff4fcb1e0
2020-05-01 04:47:17 +00:00
Remi NGUYEN VAN
d04dcdcea0 Merge "Use the new NetworkStackConnector constructor" am: 062e45d48c
Change-Id: Ifaef8916460a4c3c275b9cdf20ee87b562a42785
2020-05-01 04:30:38 +00:00
Remi NGUYEN VAN
062e45d48c Merge "Use the new NetworkStackConnector constructor" 2020-05-01 04:19:29 +00:00
Remi NGUYEN VAN
0d0e77ef3e [automerger skipped] Merge "Add comment / logging in NetworkMonitor callbacks" into rvc-dev am: a294a88751 -s ours am: 416fe56663 -s ours
am skip reason: Change-Id I2dbfc9bf7b2f785ea4594851bd354e9fd0fc0bd1 with SHA-1 3d3c9f7b76 is in history

Change-Id: I0bffe3f40347b1edcb802bd681b3584af4da3501
2020-05-01 01:05:22 +00:00
Remi NGUYEN VAN
754eac8368 [automerger skipped] Merge "Add comment / logging in NetworkMonitor callbacks" into rvc-dev am: a294a88751 am: 1f6d977758 -s ours
am skip reason: Change-Id I2dbfc9bf7b2f785ea4594851bd354e9fd0fc0bd1 with SHA-1 455b93d137 is in history

Change-Id: Ia099fdd063af5b9ccac85c4a32ed1337e21c2e54
2020-05-01 01:05:13 +00:00
Remi NGUYEN VAN
1f6d977758 Merge "Add comment / logging in NetworkMonitor callbacks" into rvc-dev am: a294a88751
Change-Id: I57d8597082c7cf72494e5d16bb0ff7cbc83fba37
2020-05-01 00:51:42 +00:00
Remi NGUYEN VAN
416fe56663 [automerger skipped] Merge "Add comment / logging in NetworkMonitor callbacks" into rvc-dev am: a294a88751 -s ours
am skip reason: Change-Id I2dbfc9bf7b2f785ea4594851bd354e9fd0fc0bd1 with SHA-1 455b93d137 is in history

Change-Id: Ie0d51de52ed26f4eabc0c0f6e72e4ec455b6a039
2020-05-01 00:51:36 +00:00
Remi NGUYEN VAN
a294a88751 Merge "Add comment / logging in NetworkMonitor callbacks" into rvc-dev 2020-05-01 00:32:07 +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
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
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
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
Remi NGUYEN VAN
3d3c9f7b76 Add comment / logging in NetworkMonitor callbacks
Add a comment explaining the ordering of messages sent to the tracker
and connectivity diagnostics handlers.

Add a Slog.wtf call in case the deprecated notifyNetworkTested callback
is called.

Bug: 153500847
Test: atest ConnectivityServiceTest
Merged-In: I2dbfc9bf7b2f785ea4594851bd354e9fd0fc0bd1
Change-Id: I2dbfc9bf7b2f785ea4594851bd354e9fd0fc0bd1
2020-04-30 06:12:18 +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
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
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
e19fcdf1a5 Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4 am: 6c3df199cd
Change-Id: Iff7435b20b830357a53f4773b211cd5ddc911ebd
2020-04-29 09:42:14 +00:00