commit 0da3eb137d82f0225435dc79c97f420b49f0c98f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 09 18:11:51 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 09 18:11:51 2023 +0000
tree 296b64faaebd35211b2258a2a48cfca24415bb68
parent 749de355e46a7726a81b811144d8d2cc37b3cc18
parent 2c36be958b01edeb8a96214a8c1a636608644a5f

Merge "SuppressLint for use of TIOCOUTQ constant." am: c17aee3117 am: 6db324439f am: 2fdaca0d56 am: 2c36be958b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2620253

Change-Id: I5f38d424c8ade2f938afcc6f10e9175aca424609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/src/com/android/server/connectivity/TcpKeepaliveController.java

diff --git a/service/src/com/android/server/connectivity/TcpKeepaliveController.java b/service/src/com/android/server/connectivity/TcpKeepaliveController.java
index 0fd8604..4124e36 100644
--- a/service/src/com/android/server/connectivity/TcpKeepaliveController.java
+++ b/service/src/com/android/server/connectivity/TcpKeepaliveController.java
@@ -34,6 +34,7 @@
 import static com.android.net.module.util.NetworkStackConstants.IPV4_HEADER_MIN_LEN;
 
 import android.annotation.NonNull;
+import android.annotation.SuppressLint;
 import android.net.ISocketKeepaliveCallback;
 import android.net.InvalidPacketException;
 import android.net.NetworkUtils;
@@ -106,6 +107,8 @@
     private static final int TCP_REPAIR_ON = 1;
     // Reference include/uapi/linux/sockios.h
     private static final int SIOCINQ = FIONREAD;
+    // arch specific BSD socket API constant that predates Linux and Android
+    @SuppressLint("NewApi")
     private static final int SIOCOUTQ = TIOCOUTQ;
 
     /**