LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,724 Commits 2 Branches 0 Tags
1a80cea77b000f17b5c7ded94de5d6f69eed2cc2
Commit Graph

7724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
6eed854a32 Revert "Revert "Take all VPN underlying networks into account when migrating traffic for"" 
This reverts commit 9863ba9f09.

Reason for revert: Fix available for deadlocks.

Bug: 113122541
Bug: 134244752
Merged-In: Ib65214598837289bd39dbf040b56ab7835f893ba
Change-Id: Ia90bf2c72ef686e80800d113d03548e0efcadb66
(cherry picked from commit b393d28d65)
 2019-06-21 01:09:49 +00:00
Chalard Jean
d01acc2c52 Merge "Factorize custom asserts." am: 6c176efa3d am: 99fbb40990 
am: 1cf6627d18

Change-Id: I8774ea64f004999ddb46223a76a671388687d455
 2019-06-20 14:06:58 -07:00
Chalard Jean
1cf6627d18 Merge "Factorize custom asserts." am: 6c176efa3d 
am: 99fbb40990

Change-Id: I65ea7497abb8b77ebd10ba622075ef3b6c49b2a8
 2019-06-20 14:01:31 -07:00
Chalard Jean
6480287469 Factorize custom asserts. 
Also a few utilities that were in the way, and some opportunistic
cleanups.

Test: FrameworksNetTest NetworkStackTest
Change-Id: I385070e2044fd967cb18f1ffea9a86a4627b742e
 2019-06-20 16:24:25 +09:00
Junyu Lai
d9cc092ae9 [automerger skipped] Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev am: 94103bdf04 -s ours 
am: 158be36637 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 c7fc2f7745 is in history

Change-Id: I275dec24a2e4519265b7b50cd0a0f68fd62f2968
 2019-06-19 23:50:00 -07:00
Junyu Lai
5159a96cbb [automerger skipped] Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev am: 94103bdf04 
am: 8ffb2b0106 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 c7fc2f7745 is in history

Change-Id: I2efc2fa71b1fa94f0010020f504eaaf7d11be8af
 2019-06-19 23:32:40 -07:00
Junyu Lai
927e20cca0 [automerger skipped] Move the test of minimum supported keepalive slots to CTS am: f2ae439d82 -s ours 
am: c01cd42a56 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 c7fc2f7745 is in history

Change-Id: I1f97cf977eb04ded8da003f3f56547ca70fa1d6e
 2019-06-19 23:20:16 -07:00
Junyu Lai
7475417828 [automerger skipped] Correct value of supported keepalive count for cellular am: f55045649a -s ours 
am: f2553dea50 -s ours
am skip reason: change_id Ia3761f2e78d54866bb2e156d58004396bbc8adc3 with SHA1 59fc443325 is in history

Change-Id: I9caaa1a09ecc37735ef741e5ce43f42fa9a779e5
 2019-06-19 23:19:46 -07:00
Junyu Lai
158be36637 [automerger skipped] Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev 
am: 94103bdf04 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 c7fc2f7745 is in history

Change-Id: I6645b0b7be6f7d3b9e6fc2a547fad4df4e5e1cab
 2019-06-19 23:01:08 -07:00
Junyu Lai
c01cd42a56 [automerger skipped] Move the test of minimum supported keepalive slots to CTS 
am: f2ae439d82 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 c7fc2f7745 is in history

Change-Id: I793a942dc543573951b0cc527b3252c23f181a29
 2019-06-19 22:54:47 -07:00
Junyu Lai
f2553dea50 [automerger skipped] Correct value of supported keepalive count for cellular 
am: f55045649a -s ours
am skip reason: change_id Ia3761f2e78d54866bb2e156d58004396bbc8adc3 with SHA1 59fc443325 is in history

Change-Id: I5c37a44b17e75e439b7de21a3217237fad6e120b
 2019-06-19 22:54:32 -07:00
Junyu Lai
94103bdf04 Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev 2019-06-20 05:35:07 +00:00
Junyu Lai
f55045649a Correct value of supported keepalive count for cellular 
Cellular only supports 1 keepalive connection so correct the default
supported value to 1.

Bug: 134037217
Bug: 134352656
Test: - atest FrameworksNetTests
      - atest android.net.cts.ConnectivityManagerTest \
        #testSocketKeepaliveLimitTelephony

Merged-In: Ia3761f2e78d54866bb2e156d58004396bbc8adc3
Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
(cherry picked from commit 680abbb591d9c084d1a1e3f9dea1ed8d4e3b1ae8)
 2019-06-20 04:02:38 +00:00
Junyu Lai
f2ae439d82 Move the test of minimum supported keepalive slots to CTS 
This change also enables log when keepalive is started.

Bug: 134352656
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest FrameworksNetTests
Merged-In: I408750fa0bceb0c1c26afb5fead4e44fb824fbc1
Change-Id: Ib9b06d3458782a648a2f5b8fd5a9ca1d34bd11f9
(cherry picked from commit aed835f086440f721c279e33d6b5d4b4bc270296)
 2019-06-20 02:26:58 +00:00
Junyu Lai
414cc31635 Merge "Move the test of minimum supported keepalive slots to CTS" am: 18e3198519 am: 6ff00fee75 
am: 301bafa22e

Change-Id: If063ff023bf386884c6e42d2acb281763975ac8f
 2019-06-19 07:36:52 -07:00
Junyu Lai
7e08862acb Merge "Correct value of supported keepalive count for cellular" am: d20d6e9f1e am: 056eeae27c 
am: fca2e7c85c

Change-Id: Ia0c1e0511bffd630af4aae87cafd99e68a042149
 2019-06-19 07:36:43 -07:00
Junyu Lai
301bafa22e Merge "Move the test of minimum supported keepalive slots to CTS" am: 18e3198519 
am: 6ff00fee75

Change-Id: Ib9b06d3458782a648a2f5b8fd5a9ca1d34bd11f9
 2019-06-19 07:29:11 -07:00
Junyu Lai
fca2e7c85c Merge "Correct value of supported keepalive count for cellular" am: d20d6e9f1e 
am: 056eeae27c

Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
 2019-06-19 07:28:53 -07:00
Junyu Lai
18e3198519 Merge "Move the test of minimum supported keepalive slots to CTS" 2019-06-19 14:08:31 +00:00
Junyu Lai
d20d6e9f1e Merge "Correct value of supported keepalive count for cellular" 2019-06-19 14:08:31 +00:00
junyulai
c7fc2f7745 Move the test of minimum supported keepalive slots to CTS 
This change also enables log when keepalive is started.

Bug: 134352656
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest FrameworksNetTests
Change-Id: I408750fa0bceb0c1c26afb5fead4e44fb824fbc1
 2019-06-19 16:25:19 +08:00
Paul Hu
90f0cad875 Merge "Add SocketUtils CTS tests" am: c534d8ba36 am: f97246a87c 
am: f1ecafec13

Change-Id: I36fb368217ff50319ae6f853f0d22cfc79541b40
 2019-06-18 04:19:31 -07:00
Paul Hu
f1ecafec13 Merge "Add SocketUtils CTS tests" am: c534d8ba36 
am: f97246a87c

Change-Id: I11e638a2fab004979298708a5c75bb7c2f208f67
 2019-06-18 04:12:27 -07:00
Paul Hu
c534d8ba36 Merge "Add SocketUtils CTS tests" 2019-06-18 10:46:30 +00:00
Android Build Merger (Role)
2f7b97e9b5 Merge "[automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 -s ours am: 4f9407b6e9 -s ours am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 6eb4a5893b is in history" into qt-r1-dev-plus-aosp 2019-06-18 06:47:03 +00:00
Chalard Jean
1b56ee8e25 [automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 -s ours 
am: 4f9407b6e9 -s ours
am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 6eb4a5893b is in history

Change-Id: I45912237edf2f485e6e747c7b4878eb440096f18
 2019-06-17 23:46:20 -07:00
Chalard Jean
0853c50f94 [automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 
am: 5fa9d376ea -s ours
am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 6eb4a5893b is in history

Change-Id: Icb639762f04fbae7129a1962548dfd0da200e886
 2019-06-17 23:45:18 -07:00
Chalard Jean
4f9407b6e9 [automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev 
am: 2ae76cdbe8 -s ours
am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 6eb4a5893b is in history

Change-Id: Ib3b27436b44e678f026ce5026abf23db2f50a4cf
 2019-06-17 23:35:11 -07:00
Chalard Jean
d47182e342 Remove the <= P restriction for WIFI_P2P 
This is still sent in an intent.

Bug: 131764329
Fixes: 131764329
Merged-In: I56c86b0c1912064d5a642991df32d2cefb6a8d5b
Change-Id: I64b9d632be97dc51e6085162371bb8c19f410258
(cherry picked from commit e546cb0bd16b7359feeb3c46ba52e64cf91ae4d3)
 2019-06-18 06:15:58 +00:00
Varun Anand
d01416edfc Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: 2d731828cb am: 48f59a0fdf 
am: dd947a4fd1

Change-Id: I16884eef6e2b8d64031363cfb4adacc4a0a9ead7
 2019-06-17 10:43:22 -07:00
Varun Anand
dd947a4fd1 Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: 2d731828cb 
am: 48f59a0fdf

Change-Id: I960e94b03b29282ae2b03f78a19ed2692bd88e05
 2019-06-17 10:33:53 -07:00
Varun Anand
2d731828cb Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 
* changes:
  Remove VPN info arrays from NetworkStats(Observer|Recorder)
  NetworkStatsFactory: Take VPNs into account for network/battery stats
  Remove duplicate line in clat_simple test file
  Remove unused lastStats parameter
  Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
 2019-06-17 15:56:24 +00:00
Chalard Jean
1552a79f96 Merge "Remove the <= P restriction for WIFI_P2P" am: ea24a290bd am: bb754c9c8d 
am: 0d00b3cfd2

Change-Id: I56e16f7a29f20e4ebbbcef2228fc2935b41df564
 2019-06-17 08:28:25 -07:00
Chalard Jean
0d00b3cfd2 Merge "Remove the <= P restriction for WIFI_P2P" am: ea24a290bd 
am: bb754c9c8d

Change-Id: I14f5865249740587d550ac31b59883f4a87fd4a1
 2019-06-17 08:20:18 -07:00
Treehugger Robot
ea24a290bd Merge "Remove the <= P restriction for WIFI_P2P" 2019-06-17 14:58:21 +00:00
Android Build Merger (Role)
f3a9c9809d Merge "[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 am: a63b604929 -s ours am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 1e3b152eca is in history" into qt-r1-dev-plus-aosp 2019-06-17 14:31:27 +00:00
Chalard Jean
25b656790d [automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 
am: a63b604929 -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 1e3b152eca is in history

Change-Id: Idbcfe381f246a6d9c7e9ef3c51150f6f2a065230
 2019-06-17 07:29:56 -07:00
Chalard Jean
06a902d375 [automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 -s ours 
am: cf5d7c17a1 -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 1e3b152eca is in history

Change-Id: Iad5f4f152115dd4cbb31dbe7e37b3aea0b6ce071
 2019-06-17 07:29:54 -07:00
Chalard Jean
cf5d7c17a1 [automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev 
am: 08793a3b64 -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 1e3b152eca is in history

Change-Id: I9094b83959e1f75f90edac095060240c129b73b0
 2019-06-17 07:21:50 -07:00
Chalard Jean
342c3394d0 Simplification of code to prevent a Log.wtf in expected cases. 
This mostly serves to unindent code to make it locally more
readable. It is a functional no-op.

Bug: 135043192
Test: atest FrameworksNetTests
Merged-In: Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80
Change-Id: I80bebcd04c277f6e4b0665fe1253b2309e3bc535
(cherry picked from commit e1f5759319a4559b3cf89029449878dc56f92bb7)
 2019-06-17 13:16:46 +00:00
Chalard Jean
1c44f05067 Merge "Simplification of code to prevent a Log.wtf in expected cases." am: 3ef0c36587 am: fbc68b975a 
am: 8d69c6dca3

Change-Id: I846943dc91ef3cb6dc7516ba38dc93fb8a80bb88
 2019-06-17 04:34:32 -07:00
Chalard Jean
8d69c6dca3 Merge "Simplification of code to prevent a Log.wtf in expected cases." am: 3ef0c36587 
am: fbc68b975a

Change-Id: I5f5fa22468c8db09e4eeb3d446220b4ebc396d98
 2019-06-17 04:24:08 -07:00
Chalard Jean
6eb4a5893b Remove the <= P restriction for WIFI_P2P 
This is still sent in an intent.

Bug: 975059
Change-Id: I56c86b0c1912064d5a642991df32d2cefb6a8d5b
 2019-06-17 19:46:34 +09:00
Chalard Jean
3ef0c36587 Merge "Simplification of code to prevent a Log.wtf in expected cases." 2019-06-17 10:37:50 +00:00
Chalard Jean
1e3b152eca Simplification of code to prevent a Log.wtf in expected cases. 
This mostly serves to unindent code to make it locally more
readable. It is a functional no-op.

Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80
 2019-06-17 18:01:35 +09:00
Android Build Merger (Role)
b78839e095 Merge "Merge "Restore the Private DNS settings to default mode upon network resets." into qt-dev am: 0cb53125b1 am: bfbb0f7ef9" into qt-r1-dev-plus-aosp 2019-06-17 04:23:02 +00:00
Xiao Ma
20c4d224e9 Merge "Restore the Private DNS settings to default mode upon network resets." into qt-dev am: 0cb53125b1 
am: bfbb0f7ef9

Change-Id: Ib4aa84f745ae26865a94325c8ba8bf8e5d6f9189
 2019-06-16 21:22:17 -07:00
Xiao Ma
0bac5c866c Merge "Restore the Private DNS settings to default mode upon network resets." into qt-dev am: 0cb53125b1 
am: adbde27464

Change-Id: Id2fb47805befac50c0428eca30ffe93590686c01
 2019-06-16 21:21:21 -07:00
Xiao Ma
adbde27464 Merge "Restore the Private DNS settings to default mode upon network resets." into qt-dev 
am: 0cb53125b1

Change-Id: I42959ec5d1194851294e007e6e3d872678a85b6d
 2019-06-16 21:15:04 -07:00
Chiachang Wang
77c880ad94 Suppress the wtf log for notifications that are expected 
PARTIAL and NO_INTERNET may happen in the real world for
those transport types that provide internet. These two
notification types should be reasonable notificaitons, not a
terrible failure as the log. For Q, it may be too risky to
display more notifications with other information instead of
SSID. Thus, suppress the wtf log for these two notifications.

Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: I35f3718fa93b403858587d918f0bc596f6c92f3e
Merged-In: I91b92249dc7905aadbc59df50c3bc6da30a8590e
Merged-In: Ia1c2a765b0fb0cc8d440c02533bdc15774a5a3ef
(cherry picked from commit ed0a54bd07ea1c9072459bafeaf796eaa4dad4c5)
 2019-06-17 02:09:27 +00:00