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

Commit 649312a6 authored by Jeremy Meyer's avatar Jeremy Meyer Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream... 

Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us...""" into tm-dev am: 0308928e am: 14bd99fc

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



Change-Id: I1561e9145bcdec7b950ee4223a29e9b3f2bfb4d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e0d4bdf 14bd99fc

core/java/android/content/res/AssetFileDescriptor.java

+45 −52
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.os.Bundle; 
import android.os.Parcel;

import android.os.ParcelFileDescriptor;

import android.os.Parcelable;

import android.system.ErrnoException;

import android.system.Os;



import java.io.Closeable;

import java.io.FileDescriptor;
@@ -205,24 +203,19 @@ public class AssetFileDescriptor implements Parcelable, Closeable { 
     */

    public static class AutoCloseInputStream

            extends ParcelFileDescriptor.AutoCloseInputStream {

        private final long mSizeFromStartOffset;

        private final long mStartOffset;

        private long mPosFromStartOffset;

        private long mRemaining;



        public AutoCloseInputStream(AssetFileDescriptor fd) throws IOException {

            super(fd.getParcelFileDescriptor());

            // this skip is necessary if getChannel() is called

            super.skip(fd.getStartOffset());

            mSizeFromStartOffset = fd.getLength();

            mStartOffset = fd.getStartOffset();

            mRemaining = (int) fd.getLength();

        }



        @Override

        public int available() throws IOException {

            long available = mSizeFromStartOffset - mPosFromStartOffset;

            return available >= 0

                    ? (available < 0x7fffffff ? (int) available : 0x7fffffff)

                    : 0;

            return mRemaining >= 0

                    ? (mRemaining < 0x7fffffff ? (int) mRemaining : 0x7fffffff)

                    : super.available();

        }



        @Override
@@ -234,24 +227,15 @@ public class AssetFileDescriptor implements Parcelable, Closeable { 


        @Override

        public int read(byte[] buffer, int offset, int count) throws IOException {

            int available = available();



            if (available <= 0) {

                return -1;

            } else {

                if (count > available) count = available;

                try {

                    int res = Os.pread(getFD(), buffer, offset, count,

                            mStartOffset + mPosFromStartOffset);

                    // pread returns 0 at end of file, while java's InputStream interface

                    // requires -1

                    if (res == 0) res = -1;

                    if (res >= 0) mPosFromStartOffset += res;

            if (mRemaining >= 0) {

                if (mRemaining == 0) return -1;

                if (count > mRemaining) count = (int) mRemaining;

                int res = super.read(buffer, offset, count);

                if (res >= 0) mRemaining -= res;

                return res;

                } catch (ErrnoException e) {

                    throw new IOException(e);

                }

            }



            return super.read(buffer, offset, count);

        }



        @Override
@@ -261,32 +245,42 @@ public class AssetFileDescriptor implements Parcelable, Closeable { 


        @Override

        public long skip(long count) throws IOException {

            int available = available();

            if (available <= 0) {

                return -1;

            } else {

                if (count > available) count = available;

                mPosFromStartOffset += count;

                return count;

            if (mRemaining >= 0) {

                if (mRemaining == 0) return -1;

                if (count > mRemaining) count = mRemaining;

                long res = super.skip(count);

                if (res >= 0) mRemaining -= res;

                return res;

            }



            return super.skip(count);

        }



        @Override

        public void mark(int readlimit) {

            if (mRemaining >= 0) {

                // Not supported.

                return;

            }

            super.mark(readlimit);

        }



        @Override

        public boolean markSupported() {

            if (mRemaining >= 0) {

                return false;

            }

            return super.markSupported();

        }



        @Override

        public synchronized void reset() throws IOException {

            if (mRemaining >= 0) {

                // Not supported.

                return;

            }

            super.reset();

        }

    }



    /**
@@ -381,7 +375,6 @@ public class AssetFileDescriptor implements Parcelable, Closeable { 
        public AssetFileDescriptor createFromParcel(Parcel in) {

            return new AssetFileDescriptor(in);

        }



        public AssetFileDescriptor[] newArray(int size) {

            return new AssetFileDescriptor[size];

        }