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

Commit cb45faa8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Stop using Arrays.checkOffsetAndCount. am: 60f55a25" into... 

Merge "Merge "Stop using Arrays.checkOffsetAndCount. am: 60f55a25" into stage-aosp-master am: 72629d99" into pi-dev-plus-aosp
parents a3cb0ae7 306481a6

core/java/android/content/pm/LimitedLengthInputStream.java

+3 −2
Original line number Original line Diff line number Diff line 
package android.content.pm;

package android.content.pm;





import libcore.util.ArrayUtils;



import java.io.FilterInputStream;

import java.io.FilterInputStream;

import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;

import java.util.Arrays;





/**

/**

 * A class that limits the amount of data that is read from an InputStream. When

 * A class that limits the amount of data that is read from an InputStream. When
@@ -71,7 +72,7 @@ public class LimitedLengthInputStream extends FilterInputStream { 
        }

        }





        final int arrayLength = buffer.length;

        final int arrayLength = buffer.length;

        Arrays.checkOffsetAndCount(arrayLength, offset, byteCount);

        ArrayUtils.throwsIfOutOfBounds(arrayLength, offset, byteCount);





        if (mOffset > Long.MAX_VALUE - byteCount) {

        if (mOffset > Long.MAX_VALUE - byteCount) {

            throw new IOException("offset out of bounds: " + mOffset + " + " + byteCount);

            throw new IOException("offset out of bounds: " + mOffset + " + " + byteCount);

core/java/android/os/FileBridge.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,12 +27,12 @@ import libcore.io.IoBridge; 
import libcore.io.IoUtils;

import libcore.io.IoUtils;

import libcore.io.Memory;

import libcore.io.Memory;

import libcore.io.Streams;

import libcore.io.Streams;

import libcore.util.ArrayUtils;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.IOException;

import java.io.IOException;

import java.io.OutputStream;

import java.io.OutputStream;

import java.nio.ByteOrder;

import java.nio.ByteOrder;

import java.util.Arrays;





/**

/**

 * Simple bridge that allows file access across process boundaries without

 * Simple bridge that allows file access across process boundaries without
@@ -178,7 +178,7 @@ public class FileBridge extends Thread { 




        @Override

        @Override

        public void write(byte[] buffer, int byteOffset, int byteCount) throws IOException {

        public void write(byte[] buffer, int byteOffset, int byteCount) throws IOException {

            Arrays.checkOffsetAndCount(buffer.length, byteOffset, byteCount);

            ArrayUtils.throwsIfOutOfBounds(buffer.length, byteOffset, byteCount);

            Memory.pokeInt(mTemp, 0, CMD_WRITE, ByteOrder.BIG_ENDIAN);

            Memory.pokeInt(mTemp, 0, CMD_WRITE, ByteOrder.BIG_ENDIAN);

            Memory.pokeInt(mTemp, 4, byteCount, ByteOrder.BIG_ENDIAN);

            Memory.pokeInt(mTemp, 4, byteCount, ByteOrder.BIG_ENDIAN);

            IoBridge.write(mClient, mTemp, 0, MSG_LENGTH);

            IoBridge.write(mClient, mTemp, 0, MSG_LENGTH);

core/java/android/os/Parcel.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import dalvik.annotation.optimization.CriticalNative; 
import dalvik.annotation.optimization.FastNative;

import dalvik.annotation.optimization.FastNative;

import dalvik.system.VMRuntime;

import dalvik.system.VMRuntime;





import libcore.util.ArrayUtils;

import libcore.util.SneakyThrow;

import libcore.util.SneakyThrow;





import java.io.ByteArrayInputStream;

import java.io.ByteArrayInputStream;
@@ -47,7 +48,6 @@ import java.lang.reflect.Array; 
import java.lang.reflect.Field;

import java.lang.reflect.Field;

import java.lang.reflect.Modifier;

import java.lang.reflect.Modifier;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;
@@ -631,7 +631,7 @@ public final class Parcel { 
            writeInt(-1);

            writeInt(-1);

            return;

            return;

        }

        }

        Arrays.checkOffsetAndCount(b.length, offset, len);

        ArrayUtils.throwsIfOutOfBounds(b.length, offset, len);

        nativeWriteByteArray(mNativePtr, b, offset, len);

        nativeWriteByteArray(mNativePtr, b, offset, len);

    }

    }
@@ -660,7 +660,7 @@ public final class Parcel { 
            writeInt(-1);

            writeInt(-1);

            return;

            return;

        }

        }

        Arrays.checkOffsetAndCount(b.length, offset, len);

        ArrayUtils.throwsIfOutOfBounds(b.length, offset, len);

        nativeWriteBlob(mNativePtr, b, offset, len);

        nativeWriteBlob(mNativePtr, b, offset, len);

    }

    }

drm/java/android/drm/DrmOutputStream.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,13 +27,13 @@ import android.util.Log; 




import libcore.io.IoBridge;

import libcore.io.IoBridge;

import libcore.io.Streams;

import libcore.io.Streams;

import libcore.util.ArrayUtils;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.FilterOutputStream;

import java.io.FilterOutputStream;

import java.io.IOException;

import java.io.IOException;

import java.io.OutputStream;

import java.io.OutputStream;

import java.net.UnknownServiceException;

import java.net.UnknownServiceException;

import java.util.Arrays;





/**

/**

 * Stream that applies a {@link DrmManagerClient} transformation to data before

 * Stream that applies a {@link DrmManagerClient} transformation to data before
@@ -91,7 +91,7 @@ public class DrmOutputStream extends OutputStream { 




    @Override

    @Override

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

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

        Arrays.checkOffsetAndCount(buffer.length, offset, count);

        ArrayUtils.throwsIfOutOfBounds(buffer.length, offset, count);





        final byte[] exactBuffer;

        final byte[] exactBuffer;

        if (count == buffer.length) {

        if (count == buffer.length) {