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

7394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyu Lai
da5af923d3 [automerger skipped] Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev am: e660a0a7e2 -s ours am: 893d1305c8 -s ours 
am: ceabb4f7c5 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 5b3b486b8f is in history

Change-Id: If6ce89326f5fbe369ceea6721e4682804378de2a
 2019-06-20 09:27:08 -07:00
Junyu Lai
22f5b3c4b1 [automerger skipped] Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev am: e660a0a7e2 am: 8ffb2b0106 -s ours 
am: ab7adea1ef -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 5b3b486b8f is in history

Change-Id: Id063dd59ce6fcb7f6b87c264146408c108aa400a
 2019-06-20 09:22:06 -07:00
Junyu Lai
3fbd2ccff2 [automerger skipped] Move the test of minimum supported keepalive slots to CTS am: ca8b6ed19f -s ours am: 9205ceb27c -s ours 
am: fea7663137 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 5b3b486b8f is in history

Change-Id: I11ac7743e9b080fa184bcfd335aec96a9539e209
 2019-06-20 09:13:18 -07:00
Junyu Lai
f37efa1650 [automerger skipped] Correct value of supported keepalive count for cellular am: 03e193c8a7 -s ours am: 80b7c69d6f -s ours 
am: 864526737b -s ours
am skip reason: change_id Ia3761f2e78d54866bb2e156d58004396bbc8adc3 with SHA1 ede0d5075b is in history

Change-Id: I8a1a859bfde1c76a66337e4739b3fd9f7341be01
 2019-06-20 09:12:48 -07:00
Junyu Lai
ceabb4f7c5 [automerger skipped] Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev am: e660a0a7e2 -s ours 
am: 893d1305c8 -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 5b3b486b8f is in history

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

Change-Id: I2efc2fa71b1fa94f0010020f504eaaf7d11be8af
 2019-06-19 23:32:40 -07:00
Junyu Lai
fea7663137 [automerger skipped] Move the test of minimum supported keepalive slots to CTS am: ca8b6ed19f -s ours 
am: 9205ceb27c -s ours
am skip reason: change_id I408750fa0bceb0c1c26afb5fead4e44fb824fbc1 with SHA1 5b3b486b8f is in history

Change-Id: I1f97cf977eb04ded8da003f3f56547ca70fa1d6e
 2019-06-19 23:20:16 -07:00
Junyu Lai
864526737b [automerger skipped] Correct value of supported keepalive count for cellular am: 03e193c8a7 -s ours 
am: 80b7c69d6f -s ours
am skip reason: change_id Ia3761f2e78d54866bb2e156d58004396bbc8adc3 with SHA1 ede0d5075b is in history

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

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

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

Change-Id: I5c37a44b17e75e439b7de21a3217237fad6e120b
 2019-06-19 22:54:32 -07:00
Junyu Lai
e660a0a7e2 Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev 2019-06-20 05:35:07 +00:00
Junyu Lai
03e193c8a7 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
ca8b6ed19f 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
a34b3a0c7e Merge "Move the test of minimum supported keepalive slots to CTS" am: c961e03526 am: 6ff00fee75 am: 59cc58b295 
am: d49c60d1db

Change-Id: I13f47ed986756933172886d7e0c9b5d653fc34e7
 2019-06-19 07:44:59 -07:00
Junyu Lai
21f74325c0 Merge "Correct value of supported keepalive count for cellular" am: 7423873ac8 am: 056eeae27c am: bafc7c9b8f 
am: f2b2fec787

Change-Id: I621066b8c4cd9b244b4d70f84d428b5b784e0387
 2019-06-19 07:44:39 -07:00
Junyu Lai
d49c60d1db Merge "Move the test of minimum supported keepalive slots to CTS" am: c961e03526 am: 6ff00fee75 
am: 59cc58b295

Change-Id: If063ff023bf386884c6e42d2acb281763975ac8f
 2019-06-19 07:36:52 -07:00
Junyu Lai
f2b2fec787 Merge "Correct value of supported keepalive count for cellular" am: 7423873ac8 am: 056eeae27c 
am: bafc7c9b8f

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

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

Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
 2019-06-19 07:28:53 -07:00
Junyu Lai
c961e03526 Merge "Move the test of minimum supported keepalive slots to CTS" 2019-06-19 14:08:31 +00:00
Junyu Lai
7423873ac8 Merge "Correct value of supported keepalive count for cellular" 2019-06-19 14:08:31 +00:00
junyulai
5b3b486b8f 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
6bb555b289 Merge "Add SocketUtils CTS tests" am: 37377069ba am: f97246a87c am: 232ad69eaa 
am: aabfe43d3b

Change-Id: I36252fdf516cf4a9d4506b615cdb38f5413739e5
 2019-06-18 04:26:29 -07:00
Paul Hu
aabfe43d3b Merge "Add SocketUtils CTS tests" am: 37377069ba am: f97246a87c 
am: 232ad69eaa

Change-Id: I36fb368217ff50319ae6f853f0d22cfc79541b40
 2019-06-18 04:19:31 -07:00
Paul Hu
232ad69eaa Merge "Add SocketUtils CTS tests" am: 37377069ba 
am: f97246a87c

Change-Id: I11e638a2fab004979298708a5c75bb7c2f208f67
 2019-06-18 04:12:27 -07:00
Paul Hu
37377069ba Merge "Add SocketUtils CTS tests" 2019-06-18 10:46:30 +00:00
Chalard Jean
3e7392551f Merge "[automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 -s ours am: dd6df6a38f -s ours 
am: 507ef41b5f -s ours
am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 a070aaa88f is in history

Change-Id: I5a32e2f718871d43e02b07f7c5ae8eca0c1cb44a
 2019-06-17 23:55:17 -07:00
Chalard Jean
8e973ce7a7 [automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 am: 5fa9d376ea -s ours 
am: f796d8b495 -s ours
am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 a070aaa88f is in history

Change-Id: Ida933ad5a9fec92e61696f0433ffe71d46a1fd4e
 2019-06-17 23:53:12 -07:00
Android Build Merger (Role)
507ef41b5f Merge "[automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 -s ours am: dd6df6a38f -s ours am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 a070aaa88f is in history" into qt-r1-dev-plus-aosp 2019-06-18 06:47:03 +00:00
Chalard Jean
b649cdf0a4 [automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 -s ours 
am: dd6df6a38f -s ours
am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 a070aaa88f is in history

Change-Id: I45912237edf2f485e6e747c7b4878eb440096f18
 2019-06-17 23:46:20 -07:00
Chalard Jean
f796d8b495 [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 a070aaa88f is in history

Change-Id: Icb639762f04fbae7129a1962548dfd0da200e886
 2019-06-17 23:45:18 -07:00
Chalard Jean
dd6df6a38f [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 a070aaa88f is in history

Change-Id: Ib3b27436b44e678f026ce5026abf23db2f50a4cf
 2019-06-17 23:35:11 -07:00
Chalard Jean
c34b699c2e 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
daacadc918 Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: 2ce04660f6 am: 48f59a0fdf am: 950e0419c0 
am: c7972c61f4

Change-Id: I8415a7c91158cce99e91e6054ed4f40e44563b89
 2019-06-17 10:59:29 -07:00
Varun Anand
c7972c61f4 Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: 2ce04660f6 am: 48f59a0fdf 
am: 950e0419c0

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

Change-Id: I960e94b03b29282ae2b03f78a19ed2692bd88e05
 2019-06-17 10:33:53 -07:00
Varun Anand
2ce04660f6 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
8231a1c962 Merge "Remove the <= P restriction for WIFI_P2P" am: 43a52d0aaa am: bb754c9c8d am: 649a5747ef 
am: feabbff9b6

Change-Id: I78bc539eb0504473f67914414b8bf062dee093b4
 2019-06-17 08:43:32 -07:00
Chalard Jean
feabbff9b6 Merge "Remove the <= P restriction for WIFI_P2P" am: 43a52d0aaa am: bb754c9c8d 
am: 649a5747ef

Change-Id: I56e16f7a29f20e4ebbbcef2228fc2935b41df564
 2019-06-17 08:28:25 -07:00
Chalard Jean
649a5747ef Merge "Remove the <= P restriction for WIFI_P2P" am: 43a52d0aaa 
am: bb754c9c8d

Change-Id: I14f5865249740587d550ac31b59883f4a87fd4a1
 2019-06-17 08:20:18 -07:00
Treehugger Robot
43a52d0aaa Merge "Remove the <= P restriction for WIFI_P2P" 2019-06-17 14:58:21 +00:00
Chalard Jean
290e02bb7c Merge "[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 am: a63b604929 -s ours 
am: 44c0110785 -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 6988872c91 is in history

Change-Id: Ibb2e2d45f5ace7a4e738daf79ff2947631133068
 2019-06-17 07:39:36 -07:00
Chalard Jean
e9edad182c [automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 -s ours am: 990438b35b -s ours 
am: df2a4b8d6e -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 6988872c91 is in history

Change-Id: I64703d9686828c7073299e00804b6942ac7ae018
 2019-06-17 07:37:49 -07:00
Android Build Merger (Role)
44c0110785 Merge "[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 am: a63b604929 -s ours am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 6988872c91 is in history" into qt-r1-dev-plus-aosp 2019-06-17 14:31:27 +00:00
Chalard Jean
897be27405 [automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 
am: a63b604929 -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 6988872c91 is in history

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

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

Change-Id: I9094b83959e1f75f90edac095060240c129b73b0
 2019-06-17 07:21:50 -07:00
Chalard Jean
5411bda0ca 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
607a4a1dab Merge "Simplification of code to prevent a Log.wtf in expected cases." am: 3cc6f6627f am: fbc68b975a am: 164ce6f0da 
am: c48e07c247

Change-Id: I80bebcd04c277f6e4b0665fe1253b2309e3bc535
 2019-06-17 04:42:04 -07:00