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

10094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chalard Jean
0cea734020 Merge "Fix a bug where a spurious capabilities callback is sent." am: 0d4995dcb7 am: 4726fe863c am: 5cc55c46d0 am: 490480eb0f 
Change-Id: I638f2a8862f15c09466bd476ff8d5e3eb76897e3
 2020-05-08 02:03:30 +00:00
Chalard Jean
490480eb0f Merge "Fix a bug where a spurious capabilities callback is sent." am: 0d4995dcb7 am: 4726fe863c am: 5cc55c46d0 
Change-Id: I614b2b8f303c90828f048a31d382b2f628ece8de
 2020-05-08 01:45:22 +00:00
Chalard Jean
5cc55c46d0 Merge "Fix a bug where a spurious capabilities callback is sent." am: 0d4995dcb7 am: 4726fe863c 
Change-Id: Ied089ed5ca553b206bdb3f7195f9e623aaabfa00
 2020-05-08 01:33:13 +00:00
Chalard Jean
4726fe863c Merge "Fix a bug where a spurious capabilities callback is sent." am: 0d4995dcb7 
Change-Id: Ide91b1e5ce2fe17dd6c6b46644e0d30b47660b2f
 2020-05-08 01:14:37 +00:00
Chalard Jean
0d4995dcb7 Merge "Fix a bug where a spurious capabilities callback is sent." 2020-05-08 00:49:33 +00:00
Sarah Chin
dd778cd5ef [automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 5581c36ff3 -s ours am: 2fcd85f62d -s ours am: bd3f35e5b4 -s ours 
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 71863e9604 is in history

Change-Id: I4d8faea3916fe55ca25d4162893f22d004176116
 2020-05-07 06:37:23 +00:00
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
Chalard Jean
d568791283 Fix a bug where a spurious capabilities callback is sent. 
When a VPN connects and it has any underlying network (which
means almost always, because it will take the default network
if it doesn't declare any), it has default capabilities and
will only take the capabilities of its underlying network
as part of an update happening after making the network
available but before the rematch can take place. This in turn
causes the capabilities callback sent as part of the rematch
to be spuriously sent.

Test: FrameworksNetTests. Also tested together with a
      followup that adds tests with drive-by coverage for this.
Bug: 150570873
Change-Id: Id7d8bba486bada1a7ba5b0f152d2aa02e407f249
 2020-05-07 12:07:03 +09: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
3440941037 [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: 5ba5a0cd67 -s ours 
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 c6081f9c50 is in history

Change-Id: I61304a3c61ea7c76a3012a27f8a0964abd32cc0a
 2020-05-05 12:22:50 +00: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
b6b3b77c60 Merge "Use the new NetworkStackConnector constructor" am: 062e45d48c am: d04dcdcea0 am: d624b40eaf am: 59e1240e94 
Change-Id: If62c0b8d106549b9afc7b6a92c3b382e0f206653
 2020-05-01 05:12:51 +00: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
2839426f91 [automerger skipped] Merge "Add comment / logging in NetworkMonitor callbacks" into rvc-dev am: a294a88751 -s ours am: 416fe56663 -s ours am: 0d0e77ef3e -s ours 
am skip reason: Change-Id I2dbfc9bf7b2f785ea4594851bd354e9fd0fc0bd1 with SHA-1 3d3c9f7b76 is in history

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

Change-Id: I780c928ba3379e8b8080e36bea055dfad4e19477
 2020-05-01 01:17:37 +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
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