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

Commit 43582df3 authored by Neil Fuller's avatar Neil Fuller
Browse files

Changes to support asynchronous close interruption 

This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
parent 53b7df19

core/java/android/os/ParcelFileDescriptor.java

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import java.io.FileInputStream; 
import java.io.FileNotFoundException;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InterruptedIOException;

import java.net.DatagramSocket;

import java.net.Socket;

import java.nio.ByteOrder;
@@ -698,6 +699,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { 
            } catch (ErrnoException e) {

                // Reporting status is best-effort

                Log.w(TAG, "Failed to report status: " + e);

            } catch (InterruptedIOException e) {

                // Reporting status is best-effort

                Log.w(TAG, "Failed to report status: " + e);

            }



        } finally {
@@ -728,6 +732,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { 
                Log.d(TAG, "Failed to read status; assuming dead: " + e);

                return new Status(Status.DEAD);

            }

        } catch (InterruptedIOException e) {

            Log.d(TAG, "Failed to read status; assuming dead: " + e);

            return new Status(Status.DEAD);

        }

    }

services/java/com/android/server/am/NativeCrashListener.java

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static libcore.io.OsConstants.*; 
import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.FileDescriptor;

import java.io.InterruptedIOException;

import java.net.InetSocketAddress;

import java.net.InetUnixAddress;
@@ -178,7 +179,7 @@ final class NativeCrashListener extends Thread { 
    }



    static int readExactly(FileDescriptor fd, byte[] buffer, int offset, int numBytes)

            throws ErrnoException {

            throws ErrnoException, InterruptedIOException {

        int totalRead = 0;

        while (numBytes > 0) {

            int n = Libcore.os.read(fd, buffer, offset + totalRead, numBytes);