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

Merge changes from topic "int32ref" am: 5cc3c631e5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86dde2fef971759b4720cfb242e8954baacf9d84
This commit is contained in:
Roland Levillain
2021-02-11 12:43:56 +00:00
committed by Automerger Merge Worker
parent a7579b2e41 5cc3c631e5
commit 7b74bf7681
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/connectivity/TcpKeepaliveController.java
View File

@@ -41,7 +41,6 @@ import android.os.Handler;
import android.os.MessageQueue;
import android.os.Messenger;
import android.system.ErrnoException;
import android.system.Int32Ref;
import android.system.Os;
import android.util.Log;
import android.util.SparseArray;
@@ -306,9 +305,8 @@ public class TcpKeepaliveController {
private static boolean isReceiveQueueEmpty(FileDescriptor fd)
throws ErrnoException {
Int32Ref result = new Int32Ref(-1);
Os.ioctlInt(fd, SIOCINQ, result);
if (result.value != 0) {
final int result = Os.ioctlInt(fd, SIOCINQ);
if (result != 0) {
Log.e(TAG, "Read queue has data");
return false;
}
@@ -317,9 +315,8 @@ public class TcpKeepaliveController {
private static boolean isSendQueueEmpty(FileDescriptor fd)
throws ErrnoException {
Int32Ref result = new Int32Ref(-1);
Os.ioctlInt(fd, SIOCOUTQ, result);
if (result.value != 0) {
final int result = Os.ioctlInt(fd, SIOCOUTQ);
if (result != 0) {
Log.e(TAG, "Write queue has data");
return false;
}