LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,520 Commits 2 Branches 0 Tags
ab361a6fbdcb77347bca3d11b66b757a4be9f462
Commit Graph

3520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeffrey Vander Stoep
ab361a6fbd Merge "getConnectionOwnerUid: add test for b/141603906" 
am: e8a8d9a26f

Change-Id: Ifbd37612218efb8b664d22698c64f6fdadbfafb8
 2019-10-08 03:27:58 -07:00
Jeff Vander Stoep
c9068f1b87 getConnectionOwnerUid: add test for b/141603906 
Test: on Marlin and Blueline run
    cts-tradefed run cts -m CtsHostsideNetworkTests \
    -t com.android.cts.net.HostsideVpnTests#testB141603906
Bug: 141603906
Change-Id: I759bc2295b2060e4575d61718c551d201a6455be
 2019-10-08 10:41:45 +02:00
Xin Li
b7fab0094c Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
Bug: 135460123
Change-Id: If5168b08718d9eece2a9d2b07738c5438151a53b
Merged-In: I4d60d2ad06007842be6af1f2ab844917f18cc629
 2019-09-08 13:14:43 -07:00
Xin Li
409c0dd705 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Xin Li
ada8c2f0b5 DO NOT MERGE - Merge Android 10 into master 
Bug: 139893257
Change-Id: Ifd3b99660fd3d2bf4b00dad4d30a7bdbfa35f0fc
 2019-09-04 13:32:52 -07:00
Chalard Jean
37c92ec10c Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours 
am: 97c35de59a -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I649b7cd056f818394e1887da217fed735c1809e3
 2019-08-28 15:12:44 -07:00
markchien
ddbd12377c Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours 
am: 0cfcb1a472 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I10deed57736172e6e54abcb032ad27b8caa0295b
 2019-08-28 15:10:41 -07:00
markchien
8fe93b6bda Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours 
am: ddce521efa -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I4fb6aa5ec81287040bba2c213a5f06024bd6eddf
 2019-08-28 14:24:50 -07:00
markchien
07e500dd00 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours 
am: 7ff168c7a1 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ibb2e82ee1d02bb22abe5a10b0e48c80bf7f047cf
 2019-08-28 13:56:23 -07:00
Sudheer Shanka
7732ee5a3c [automerger skipped] Merge "Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92" 
am: c497b007cb -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I00133d16a768a7fbcab7a24c2579d737a7e2dd3e
 2019-08-26 16:20:37 -07:00
Android Merger
97c35de59a Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history" 2019-08-26 22:52:33 +00:00
Chalard Jean
73480fc929 [automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev 
am: 3a915f2921 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I5f0f00463428d08d5e7b2947bde740b7f34cb161
 2019-08-26 15:52:22 -07:00
Android Merger
0cfcb1a472 Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" 2019-08-26 22:51:54 +00:00
markchien
e6e8603ce4 Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours 
am: c347654003 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I4ebcb8b4ab7ac188f4d467af54f6babd4f3682c5
 2019-08-26 15:51:47 -07:00
Android Merger
ddce521efa Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" 2019-08-26 22:38:50 +00:00
markchien
95359b77a5 Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours 
am: ddb681cafe -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Id91216812b8a1b43ac562a6cb7c450dc3db9a216
 2019-08-26 15:38:36 -07:00
Android Merger
7ff168c7a1 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history" 2019-08-26 22:34:26 +00:00
markchien
71a8c22e67 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev 
am: ffaed0bbc0 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Ice656a5071de57fc10f98192ffd11bea2ca4668f
 2019-08-26 15:34:18 -07:00
Android Merger
c497b007cb Merge "Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92" 2019-08-26 22:17:00 +00:00
Sudheer Shanka
981f30d9ea Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev 
am: e3c9363b92

Change-Id: I692bc3cae382dee7a0215871d3da658c87d45a5e
 2019-08-26 15:16:49 -07:00
Android Merger
3a915f2921 Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev 2019-08-26 21:18:31 +00:00
Chalard Jean
cc2444de25 Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev 
am: acfa8b7bb7

Change-Id: I522eb865c0fad10c40a2152d1189a8f6c454de80
 2019-08-26 14:18:20 -07:00
Android Merger
c347654003 Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev 2019-08-26 21:17:50 +00:00
markchien
b3c63b6961 Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours 
am: 4f182df10a -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I4b51a0ab8f2f19bcc4e42101be0c50616b3e2b9e
 2019-08-26 14:17:38 -07:00
Android Merger
ddb681cafe Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev 2019-08-26 21:05:29 +00:00
markchien
8367edd304 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours 
am: 956b28af13 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Idbd771af2cae19681ae9775c162906d8aaf2569c
 2019-08-26 14:05:15 -07:00
Android Merger
acfa8b7bb7 Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev 2019-08-26 19:08:35 +00:00
Chalard Jean
d5c8e158bc Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev 
am: 6bc025004b

Change-Id: I2b3537970fd494794b441340b84ed7ef4c564c06
 2019-08-26 12:08:22 -07:00
Android Merger
4f182df10a Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into oreo-mr1-cts-dev 2019-08-26 19:07:43 +00:00
markchien
c7e558b100 Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours 
am: 335491989f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I99b533a6db29b6568b487cda80ba2f7fd5a1a6ac
 2019-08-26 12:07:31 -07:00
Android Merger
6bc025004b Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev 2019-08-26 18:56:14 +00:00
Chalard Jean
b50dd23f95 Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev 
am: 28dbc1ff07

Change-Id: Ia10e54a5e4afe88df0a4f0f18136ad67021f48cb
 2019-08-26 11:56:05 -07:00
Android Merger
335491989f Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into oreo-cts-dev 2019-08-26 18:55:30 +00:00
markchien
0619ed30a2 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev 
am: 63dda3513d -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I9b3f5d162a2bf1b5e576af496f6b4428b3aaa0f4
 2019-08-26 11:55:21 -07:00
Android Merger
28dbc1ff07 Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev 2019-08-26 18:38:33 +00:00
Chalard Jean
dbafd34852 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev 
am: af4499cf45

Change-Id: Id99d972fa4d54a1f73ca11d9d1a8482fc35c9ea7
 2019-08-26 11:38:25 -07:00
Android Merger
63dda3513d Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev 2019-08-26 18:37:58 +00:00
markchien
0d6a32a571 Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev 
am: 873f2d8aa3

Change-Id: Ib9749b290a9cc943f441457b22f660cbe2b85b3b
 2019-08-26 11:37:49 -07:00
Treehugger Robot
af4499cf45 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev 2019-08-23 18:10:09 +00:00
Xin Li
6139e416d3 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
Bug: 139893257
Change-Id: Ie7606689aeb65115246c98b28a8430f1522b4437
 2019-08-23 15:37:52 +00:00
Chalard Jean
2bf54f7c79 Attempt "fix" the broken QUIC packet to be slightly less broken 
Bug: 139403355
Signed-off-by: Erik Kline <ek@google.com>
Merged-In: I9c938998b5e30f7d3994b410878b2af6a75f9b5a
Test: in I9c938998b5e30f7d3994b410878b2af6a75f9b5a
(cherry picked from commit 8ce68f1310)

Change-Id: If544089eb79801cad7660f3f419fa304387fc402
 2019-08-23 09:49:42 +00:00
Erik Kline
d66391fe0b Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" am: 2ca4e142bf am: b15ec9f17d 
am: a03e4a98ed

Change-Id: Id964bdef01759576c1e0f243af029c74ed172c73
 2019-08-16 19:33:42 -07:00
Erik Kline
a03e4a98ed Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" am: 2ca4e142bf 
am: b15ec9f17d

Change-Id: I39c2f9c69eb467bd46333cb1c8eb4a6616af2ebf
 2019-08-16 19:23:38 -07:00
Erik Kline
b15ec9f17d Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" 
am: 2ca4e142bf

Change-Id: I9764dcfe2268d2ba36cb1a530928fd01337a1ff0
 2019-08-16 19:14:50 -07:00
Erik Kline
aa76b34ae8 Attempt "fix" the broken QUIC packet to be slightly less broken 
Bug: 139403355
Signed-off-by: Erik Kline <ek@google.com>
Change-Id: I9c938998b5e30f7d3994b410878b2af6a75f9b5a
 2019-08-17 00:33:03 +00:00
markchien
8975d1e2d9 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours am: 6591499e44 -s ours 
am: 2082597684 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Iefb8c868f47f04284823531148ae493fa710c0c3
 2019-08-16 10:59:47 -07:00
markchien
89dab44695 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours am: 6591499e44 -s ours 
am: 75e1805b9f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Idc20c9ed3c587acd42320a29ab463fda5c87b9d2
 2019-08-16 10:57:12 -07:00
markchien
75e1805b9f [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours 
am: 6591499e44 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ibb3f258d59790a89f0b949f799036474e6565b1e
 2019-08-16 10:47:52 -07:00
markchien
2082597684 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours 
am: 6591499e44 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ief035b800d86e2e08af9f8488c4468f47b253071
 2019-08-16 10:47:49 -07:00
markchien
6591499e44 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours 
am: 257e3faca3 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I0a3f9ee8bfb0a20aefbed1eecdbdf95ff782c67d
 2019-08-16 10:39:20 -07:00