diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/networkstack/netlink/TcpSocketTracker.java | 8 | ||||
| -rwxr-xr-x | src/com/android/server/connectivity/NetworkMonitor.java | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/networkstack/netlink/TcpSocketTracker.java b/src/com/android/networkstack/netlink/TcpSocketTracker.java index 51b23fd..ef33f13 100644 --- a/src/com/android/networkstack/netlink/TcpSocketTracker.java +++ b/src/com/android/networkstack/netlink/TcpSocketTracker.java @@ -49,6 +49,7 @@ import android.net.netlink.StructNlMsgHdr; import android.net.util.NetworkStackUtils; import android.net.util.SocketUtils; import android.os.AsyncTask; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.SystemClock; @@ -65,6 +66,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.networkstack.apishim.NetworkShimImpl; +import com.android.networkstack.apishim.common.ShimUtils; import com.android.networkstack.apishim.common.UnsupportedApiLevelException; import java.io.FileDescriptor; @@ -523,11 +525,9 @@ public class TcpSocketTracker { @VisibleForTesting public static class Dependencies { private final Context mContext; - private final boolean mIsTcpInfoParsingSupported; - public Dependencies(final Context context, final boolean tcpSupport) { + public Dependencies(final Context context) { mContext = context; - mIsTcpInfoParsingSupported = tcpSupport; } /** @@ -578,7 +578,7 @@ public class TcpSocketTracker { public boolean isTcpInfoParsingSupported() { // Request tcp info from NetworkStack directly needs extra SELinux permission added // after Q release. - return mIsTcpInfoParsingSupported; + return ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q); } /** diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 61dece0..7fb6761 100755 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -3374,8 +3374,7 @@ public class NetworkMonitor extends StateMachine { CONFIG_DATA_STALL_EVALUATION_TYPE, DEFAULT_DATA_STALL_EVALUATION_TYPES) & DATA_STALL_EVALUATION_TYPE_TCP) != 0) - ? new TcpSocketTracker(new TcpSocketTracker.Dependencies(context, - ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q)), network) + ? new TcpSocketTracker(new TcpSocketTracker.Dependencies(context), network) : null; } |