LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "StrictMode to detect untagged network traffic."

Browse Source
This commit is contained in:
Jeff Sharkey
2017-01-20 17:31:55 +00:00
committed by Android (Google) Code Review
parent 9de405bfbe 475c3eadb0
commit 3d4135dd9d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
View File

@@ -23,6 +23,7 @@ import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.TrafficStats;
import android.os.SystemClock; import android.os.SystemClock;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
@@ -381,7 +382,12 @@ public class NetworkDiagnostics {
protected void setupSocket( protected void setupSocket(
int sockType, int protocol, long writeTimeout, long readTimeout, int dstPort) int sockType, int protocol, long writeTimeout, long readTimeout, int dstPort)
throws ErrnoException, IOException { throws ErrnoException, IOException {
final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);
try {
mFileDescriptor = Os.socket(mAddressFamily, sockType, protocol); mFileDescriptor = Os.socket(mAddressFamily, sockType, protocol);
} finally {
TrafficStats.setThreadStatsTag(oldTag);
}
// Setting SNDTIMEO is purely for defensive purposes. // Setting SNDTIMEO is purely for defensive purposes.
Os.setsockoptTimeval(mFileDescriptor, Os.setsockoptTimeval(mFileDescriptor,
SOL_SOCKET, SO_SNDTIMEO, StructTimeval.fromMillis(writeTimeout)); SOL_SOCKET, SO_SNDTIMEO, StructTimeval.fromMillis(writeTimeout));