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

Commit 2d29d2d8 authored by Roland Levillain's avatar Roland Levillain Committed by Gerrit Code Review
Browse files

Merge changes from topic "int32ref" 

* changes:
  [Mainline] android.system package APIs migration
  Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore
parents f67a99fe 80f8c777

core/java/android/content/ContentResolver.java

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ import android.os.ServiceManager; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.os.storage.StorageManager;

import android.system.Int32Ref;

import android.system.Int64Ref;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;
@@ -4040,7 +4040,7 @@ public abstract class ContentResolver implements ContentInterface { 
        // Convert to Point, since that's what the API is defined as

        final Bundle opts = new Bundle();

        opts.putParcelable(EXTRA_SIZE, Point.convert(size));

        final Int32Ref orientation = new Int32Ref(0);

        final Int64Ref orientation = new Int64Ref(0);



        Bitmap bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(() -> {

            final AssetFileDescriptor afd = content.openTypedAssetFile(uri, "image/*", opts,

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;

        }