summaryrefslogtreecommitdiff
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* Merge "[CS] Support "instant failure" from factories"Etan Cohen2019-02-222-3/+65
|\
| * [CS] Support "instant failure" from factoriesEtan Cohen2019-02-132-3/+65
* | Merge "Fix framework and NetworkStack classes conflicts" am: 3f23efdd13 am: 2...Remi NGUYEN VAN2019-02-153-417/+0
|\ \
| * \ Merge "Fix framework and NetworkStack classes conflicts"Remi NGUYEN VAN2019-02-153-417/+0
| |\ \
| | * \ Merge "Fix framework and NetworkStack classes conflicts"Remi NGUYEN VAN2019-02-163-417/+0
| | |\ \
| | | * | Fix framework and NetworkStack classes conflictsRemi NGUYEN VAN2019-02-153-417/+0
| * | | | Merge "Move NetworkStack to services.net"Remi NGUYEN VAN2019-02-151-262/+3
| |\| | |
| | * | | Merge "Move NetworkStack to services.net"Remi NGUYEN VAN2019-02-151-262/+3
| | |\| |
| | | * | Move NetworkStack to services.netRemi NGUYEN VAN2019-02-151-262/+3
| * | | | Merge "Remove NetworkMonitor dependency on ICaptivePortal"Remi NGUYEN VAN2019-02-154-4/+5
| |\| | |
| | * | | Merge "Remove NetworkMonitor dependency on ICaptivePortal"Remi NGUYEN VAN2019-02-154-4/+5
| | |\| |
| | | * | Remove NetworkMonitor dependency on ICaptivePortalRemi NGUYEN VAN2019-02-154-4/+5
| * | | | Merge "Remove deps from framework on netd interfaces"Remi NGUYEN VAN2019-02-142-12/+3
| |\| | |
| | * | | Merge "Remove deps from framework on netd interfaces"Remi NGUYEN VAN2019-02-152-12/+3
| | |\| |
| | | * | Remove deps from framework on netd interfacesRemi NGUYEN VAN2019-02-142-12/+3
| * | | | Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-...Xin Li2019-02-144-9/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) intoXin Li2019-02-144-9/+9
| | |\ \ \
| | | * | | Fix negative uid stats caused by 464xlat adjust when eBPF is on.junyulai2018-12-051-7/+17
* | | | | | Merge "Move NetworkStack to services.net"Remi NGUYEN VAN2019-02-151-262/+3
|\ \ \ \ \ \
| * | | | | | Move NetworkStack to services.netRemi NGUYEN VAN2019-02-141-262/+3
* | | | | | | Merge "Remove NetworkMonitor dependency on ICaptivePortal"Remi NGUYEN VAN2019-02-154-4/+5
|\| | | | | |
| * | | | | | Remove NetworkMonitor dependency on ICaptivePortalRemi NGUYEN VAN2019-02-144-4/+5
* | | | | | | Merge "Add Test Network and Transport types" am: 0dddb902ae am: ffd15698c3Benedict Wong2019-02-142-4/+23
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Add Test Network and Transport types" am: 0dddb902aeBenedict Wong2019-02-142-4/+23
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Add Test Network and Transport types"Benedict Wong2019-02-142-4/+23
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Add Test Network and Transport typesBenedict Wong2019-02-112-4/+23
* | | | | | | | Merge "Remove deps from framework on netd interfaces"Remi NGUYEN VAN2019-02-142-12/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove deps from framework on netd interfacesRemi NGUYEN VAN2019-02-132-12/+3
* | | | | | | | Merge "Check NetworkStack UID and perms before binding" am: c96b852f46 am: 89...Remi NGUYEN VAN2019-02-121-1/+29
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge "Check NetworkStack UID and perms before binding" am: c96b852f46Remi NGUYEN VAN2019-02-121-1/+29
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Check NetworkStack UID and perms before binding"Remi NGUYEN VAN2019-02-131-1/+29
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Check NetworkStack UID and perms before bindingRemi NGUYEN VAN2019-02-081-1/+29
* | | | | | | Merge "Remove hard-coded NetworkStack package name" am: e765e8b7aa am: d49230...Remi NGUYEN VAN2019-02-112-4/+1
|\| | | | | | | |_|_|/ / / |/| | | | |
| * | | | | Merge "Remove hard-coded NetworkStack package name" am: e765e8b7aaRemi NGUYEN VAN2019-02-112-4/+1
| |\| | | |
| | * | | | Merge "Remove hard-coded NetworkStack package name"Remi NGUYEN VAN2019-02-122-4/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Remove hard-coded NetworkStack package nameRemi NGUYEN VAN2019-02-082-4/+1
| | | |/ /
* | | | | Merge "Add API for NetworkStack to start captive portal" am: ca551ce981 am: 7...Remi NGUYEN VAN2019-02-062-0/+21
|\| | | |
| * | | | Merge "Add API for NetworkStack to start captive portal" am: ca551ce981Remi NGUYEN VAN2019-02-062-0/+21
| |\| | |
| | * | | Merge "Add API for NetworkStack to start captive portal"Remi NGUYEN VAN2019-02-072-0/+21
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add API for NetworkStack to start captive portalRemi NGUYEN VAN2019-02-062-0/+21
* | | | | Merge "[KA04] Expose TCP socket keepalive API" am: e5f71e4ed0 am: e38d50b7c8Chalard Jean2019-02-066-2/+165
|\| | | |
| * | | | Merge "[KA04] Expose TCP socket keepalive API" am: e5f71e4ed0Chalard Jean2019-02-066-2/+165
| |\| | |
| | * | | [KA04] Expose TCP socket keepalive APIjunyulai2019-02-066-2/+165
* | | | | Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: 53...Chalard Jean2019-02-062-3/+41
|\| | | |
| * | | | Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: 53...Chalard Jean2019-02-062-3/+41
| |\| | |
| | * | | Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData"Chalard Jean2019-02-062-3/+41
| | |\ \ \
| | | * | | [KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketDatajunyulai2019-02-062-3/+41
* | | | | | Merge "Deprecate getActiveLinkProperties." am: 4b7cae6c0d am: 19159dbc95Chalard Jean2019-02-061-5/+13
|\| | | | |
| * | | | | Merge "Deprecate getActiveLinkProperties." am: 4b7cae6c0dChalard Jean2019-02-061-5/+13
| |\| | | |
| | * | | | Merge "Deprecate getActiveLinkProperties."Treehugger Robot2019-02-061-5/+13
| | |\ \ \ \ | | | |/ / / | | |/| | |