diff options
author | Pete Gillin <peteg@google.com> | 2018-05-10 15:40:32 +0100 |
---|---|---|
committer | Pete Gillin <peteg@google.com> | 2018-05-10 18:17:50 +0100 |
commit | 60f55a255f1cd379bfc6cbc9122c43d48925f7c4 (patch) | |
tree | f1b6a0de3a727a849285a2fba59fd5aae40cbf27 /drm/java/android | |
parent | d0b9f983d6687fc88074926f5e5e5c1b7ac7ee97 (diff) |
Stop using Arrays.checkOffsetAndCount.
Start using ArrayUtils.throwsIfOutOfBounds instead. The Arrays method
is going to be removed.
Bug: 78447530
Test: cts-tradefed run cts-dev -m CtsOsTestCases (shows only unrelated failures: two user/userdebug mismatches and one from b/79471510)
Test: cts-tradefed run cts-dev -m CtsDrmTestCases
Test: adb shell am instrument -w -e class android.content.pm.LimitedLengthInputStreamTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -w -e class android.os.FileBridgeTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib3cd4f4ead61dbec1ccdc94b2ad4ad9c28574582
Diffstat (limited to 'drm/java/android')
-rw-r--r-- | drm/java/android/drm/DrmOutputStream.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/java/android/drm/DrmOutputStream.java b/drm/java/android/drm/DrmOutputStream.java index ba1c56fbec8c..9c238348846e 100644 --- a/drm/java/android/drm/DrmOutputStream.java +++ b/drm/java/android/drm/DrmOutputStream.java @@ -27,13 +27,13 @@ import android.util.Log; import libcore.io.IoBridge; import libcore.io.Streams; +import libcore.util.ArrayUtils; import java.io.FileDescriptor; import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; import java.net.UnknownServiceException; -import java.util.Arrays; /** * Stream that applies a {@link DrmManagerClient} transformation to data before @@ -91,7 +91,7 @@ public class DrmOutputStream extends OutputStream { @Override 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; if (count == buffer.length) { |