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

Commit 9bb7ef7b authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace hidden getFileDescriptor$()" am: 842319b8 am: 4b2d4e4e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id15d49eb46923d3d5c0433babeceea9fec21386c
parents 8da61cc1 4b2d4e4e

core/java/android/net/Network.java

+15 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.SystemApi; 
import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;

import android.os.ParcelFileDescriptor;

import android.os.Parcelable;

import android.system.ErrnoException;

import android.system.Os;
@@ -380,7 +381,13 @@ public class Network implements Parcelable { 
        // Query a property of the underlying socket to ensure that the socket's file descriptor

        // exists, is available to bind to a network and is not closed.

        socket.getReuseAddress();

        bindSocket(socket.getFileDescriptor$());

        final ParcelFileDescriptor pfd = ParcelFileDescriptor.fromDatagramSocket(socket);

        bindSocket(pfd.getFileDescriptor());

        // ParcelFileDescriptor.fromSocket() creates a dup of the original fd. The original and the

        // dup share the underlying socket in the kernel. The socket is never truly closed until the

        // last fd pointing to the socket being closed. So close the dup one after binding the

        // socket to control the lifetime of the dup fd.

        pfd.close();

    }



    /**
@@ -392,7 +399,13 @@ public class Network implements Parcelable { 
        // Query a property of the underlying socket to ensure that the socket's file descriptor

        // exists, is available to bind to a network and is not closed.

        socket.getReuseAddress();

        bindSocket(socket.getFileDescriptor$());

        final ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(socket);

        bindSocket(pfd.getFileDescriptor());

        // ParcelFileDescriptor.fromSocket() creates a dup of the original fd. The original and the

        // dup share the underlying socket in the kernel. The socket is never truly closed until the

        // last fd pointing to the socket being closed. So close the dup one after binding the

        // socket to control the lifetime of the dup fd.

        pfd.close();

    }



    /**