Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4212e447 authored by Roland Levillain's avatar Roland Levillain Committed by Automerger Merge Worker
Browse files

Merge changes from topic "int32ref" am: 2d29d2d8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86dde2fef971759b4720cfb242e8954baacf9d84
parents 612b33fa 2d29d2d8

core/java/android/net/LocalSocketImpl.java

+4 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.net; 
import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.system.ErrnoException;

import android.system.Int32Ref;

import android.system.Os;

import android.system.OsConstants;

import android.system.StructLinger;
@@ -65,14 +64,11 @@ class LocalSocketImpl 
        public int available() throws IOException {

            FileDescriptor myFd = fd;

            if (myFd == null) throw new IOException("socket closed");



            Int32Ref avail = new Int32Ref(0);

            try {

                Os.ioctlInt(myFd, OsConstants.FIONREAD, avail);

                return Os.ioctlInt(myFd, OsConstants.FIONREAD);

            } catch (ErrnoException e) {

                throw e.rethrowAsIOException();

            }

            return avail.value;

        }



        /** {@inheritDoc} */

services/core/java/com/android/server/connectivity/TcpKeepaliveController.java

+4 −7
Original line number Diff line number Diff line
@@ -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;

        }