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

Merge changes from topic "int32ref"

Browse Source 
* changes:
  [Mainline] android.system package APIs migration
  Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore
This commit is contained in:
Roland Levillain
2021-02-11 12:05:36 +00:00
committed by Gerrit Code Review
parent ead8991fbb 915ad3be79
commit 5cc3c631e5
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.MessageQueue;
import android.os.Messenger; import android.os.Messenger;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Int32Ref;
import android.system.Os; import android.system.Os;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
@@ -306,9 +305,8 @@ public class TcpKeepaliveController {
private static boolean isReceiveQueueEmpty(FileDescriptor fd) private static boolean isReceiveQueueEmpty(FileDescriptor fd)
throws ErrnoException { throws ErrnoException {
Int32Ref result = new Int32Ref(-1); final int result = Os.ioctlInt(fd, SIOCINQ);
Os.ioctlInt(fd, SIOCINQ, result); if (result != 0) {
if (result.value != 0) {
Log.e(TAG, "Read queue has data"); Log.e(TAG, "Read queue has data");
return false; return false;
} }
@@ -317,9 +315,8 @@ public class TcpKeepaliveController {
private static boolean isSendQueueEmpty(FileDescriptor fd) private static boolean isSendQueueEmpty(FileDescriptor fd)
throws ErrnoException { throws ErrnoException {
Int32Ref result = new Int32Ref(-1); final int result = Os.ioctlInt(fd, SIOCOUTQ);
Os.ioctlInt(fd, SIOCOUTQ, result); if (result != 0) {
if (result.value != 0) {
Log.e(TAG, "Write queue has data"); Log.e(TAG, "Write queue has data");
return false; return false;
} }