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

3257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
markchien
ec58302ece 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: 8a4065394b -s ours 
am: 5be8f14258 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I40a141c7e295fea0245f77739d756818d9970d3a
 2019-08-26 13:32:01 -07:00
markchien
5be8f14258 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: 8a4065394b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: If9025a516481d56021235bf579c30ca2b979d379
 2019-08-26 12:55:38 -07:00
markchien
8a4065394b 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 dd32bb52f7 is in history

Change-Id: I947f0790eb6b8c71d0efdaf73592567636c368c2
 2019-08-26 12:32:53 -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
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
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
Chalard Jean
a9522fcc78 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 am: de905bf585 am: f78faad32a 
am: a2fd68d0ba

Change-Id: I299863f5ab88c2ca61da8e8d092210711ccdb0ce
 2019-08-24 02:42:37 -07:00
Chalard Jean
a2fd68d0ba [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 am: de905bf585 
am: f78faad32a

Change-Id: I7b88ca5465d73500d5c8691c92ec53902ff58a0e
 2019-08-24 02:23:25 -07:00
Chalard Jean
f78faad32a [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 
am: de905bf585

Change-Id: Ibdf13f701662456f6b03ca379bf8c5f325b064b2
 2019-08-24 01:59:06 -07:00
Chalard Jean
de905bf585 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 
am: 6e8980ff08

Change-Id: Ie516684e359060f4d3108e8acce4e1a5314959c5
 2019-08-24 01:16:51 -07:00
Android Build Merger (Role)
6e8980ff08 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 
Change-Id: I28a1f16516d3d3936d49dd7dfaa4438eef0e217a
 2019-08-24 03:32:20 +00:00
Android Build Merger (Role)
8f5db6ef71 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff 
Change-Id: Ieba241f8b9fdf26368f0648fc091c3a648fd0892
 2019-08-24 03:32:17 +00:00
Android Build Merger (Role)
080280ebff [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 
Change-Id: I2c21749f6f896e382f7afdf913ab8a84f6723c2b
 2019-08-24 03:32:12 +00:00
Android Build Merger (Role)
d086c29189 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b 
Change-Id: I7ed1d70db711cd33aa0e806d7d5f9946ca2e951c
 2019-08-24 03:32:08 +00:00
Android Build Merger (Role)
aa92791e8b [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 
Change-Id: I7f41806ea7bb0148d181e848d55e53f264596ec5
 2019-08-24 03:32:05 +00:00
Chalard Jean
ddfb743324 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev 
am: af4499cf45

Change-Id: I4036de2d4a1ccd190c559b95470fdab09cb948c0
 2019-08-23 20:31:47 -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
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
6ee1049428 Attempt "fix" the broken QUIC packet to be slightly less broken 
Bug: 139403355
Merged-In: I372c0730c9bd5329761b5a74b38e0f743bfd8230
(cherry picked from commit d6af2b5225249b178ee69dc5bac9b40c46f08d76)

Change-Id: I2955a3f9e733a5e39813a26e4cd630f79ae144a0
 2019-08-21 18:37:03 +00:00
Chalard Jean
e2cf372833 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 
am: acc1c3ab97 -s ours
am skip reason: SHA1 acc1c3ab97 skipped by user jchalard

Change-Id: I875c775b9144b02bb06cc69d1702f7e62170879b
 2019-08-21 01:59:29 -07:00
Chalard Jean
acc1c3ab97 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c 
am: 59e3425113

Change-Id: I678f59522233aa41f55143cb6508b691c209b048
 2019-08-21 01:34:42 -07:00
Chalard Jean
59e3425113 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 
am: 6c135ac35c

Change-Id: I3716bbe0bc6c575cb00bdec42540e11d89fb1d4f
 2019-08-21 01:28:22 -07:00
Chalard Jean
6c135ac35c [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c 
am: 55b8c84793

Change-Id: I61524d628dea28a95af19cb359c9bca6822eaa3f
 2019-08-21 01:21:47 -07:00
Android Build Merger (Role)
55b8c84793 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c 
Change-Id: I1e40b4240b8639860c5db001a251f28a436037c4
 2019-08-21 08:10:57 +00:00
Android Build Merger (Role)
c55b04351c [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 
Change-Id: I1b7d83a42bd6b8ae28daae974d8d751d11dbec20
 2019-08-21 08:10:50 +00:00
Android Build Merger (Role)
f611b30669 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a 
Change-Id: I13d8da83b93f444310e647f11d4e6801557a892b
 2019-08-21 08:10:44 +00:00
Android Build Merger (Role)
446311265a [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 
Change-Id: I997dd232a40e070079c446da9003f6035c53355e
 2019-08-21 08:10:38 +00:00
Android Build Merger (Role)
d6ae111ff7 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 
Change-Id: I1e15a9124ea6251fe44401f194416cbf5707d523
 2019-08-21 08:10:34 +00:00
Android Build Merger (Role)
9c8f9cef74 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 
Change-Id: I4a5a31dfb9e894afc352b082e344b17b4e3209c2
 2019-08-21 08:10:29 +00:00
Android Build Merger (Role)
c2a5ccb153 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 
Change-Id: Ica6b9699d7c429d6f0d4088fb0a05b4ecf49e818
 2019-08-21 08:10:20 +00:00
Chalard Jean
7e685d9f80 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev 
am: e9da15c22e

Change-Id: I4a659f2c16358a59a1ab981e74e0b6592fbb0a76
 2019-08-21 01:09:45 -07:00
Treehugger Robot
e9da15c22e Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev 2019-08-21 07:53:28 +00:00
Chalard Jean
8ce68f1310 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 b5e98a971a73693740a784e8bd355df41df6faa2)

Change-Id: I329c06395d63500ff20c77cee670566d83c3ac8a
 2019-08-20 10:13:50 +00: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
markchien
257e3faca3 [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 d51ae5760d is in history

Change-Id: I513c89fadd93716b099f2b21f44ae47fb70516ec
 2019-08-16 10:29:51 -07:00
markchien
52b82e3312 Exempt adb socket for hostside VpnTest 
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.

Bug: 119382723
Bug: 117194347
Test: - I solemnly swear I tested this conflict resolution
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
(cherry picked from commit de0f268f78)
 2019-08-09 12:45:45 +00:00
Mark Chien
2c5ac01165 [automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours 
am: e6bf3b799e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I57a24748b4bb6abaa50a9ff43fffb235ce54d6c1
 2019-07-31 21:11:24 -07:00
Mark Chien
e6bf3b799e [automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours 
am: 9b319aa0ef -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ia0a4c5b6dacdb18ddfeead56ebbc9d5d843f9a3d
 2019-07-31 20:46:59 -07:00
Mark Chien
9b319aa0ef [automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours 
am: ecaabe8f3e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I8f7399472b3060ad1c2a2c22e534855d8ed15486
 2019-07-31 20:34:15 -07:00
Mark Chien
ecaabe8f3e [automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev 
am: 704a9a46d8 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: If59203a033c02f870646db01d5f15029ffc8ac5c
 2019-07-31 20:22:14 -07:00
Android Build Merger (Role)
13a268e886 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848 skipped: ca53691112 
Change-Id: I6ac7579f1b95830997c573afa5f0241161c7c0ed
 2019-07-29 02:08:46 +00:00
Android Build Merger (Role)
ca53691112 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848 
Change-Id: I26195a3e5bc6146eedc178830055633d115a5c24
 2019-07-29 02:07:59 +00:00
Android Build Merger (Role)
9ee527d848 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 
Change-Id: Ie7fd5c786de0da298e2a2a3dd34ad5d5d4dab98d
 2019-07-29 02:07:54 +00:00
Android Build Merger (Role)
21e123fdf6 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f 
Change-Id: Idd42f33615f8e2e08cd60082d805bf85ff6be4d0
 2019-07-29 02:07:48 +00:00
Android Build Merger (Role)
1635ad610f [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 
Change-Id: Ib59590b6ec8012bd56dc02fd485ffb5a693dd38f
 2019-07-29 02:07:39 +00:00
markchien
c4031da617 Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev 
am: 873f2d8aa3

Change-Id: Ic968bb8f93e3471b9b5b47d336752957b23ce16b
 2019-07-26 09:50:47 -07:00
markchien
dd32bb52f7 Exempt adb socket for hostside VpnTest 
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.

Bug: 119382723
Bug: 135225500
Bug: 126645908
Test: Just cherry-pick with conflict fix

Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78)
 2019-07-18 12:43:04 +00:00