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

Commit 22180f5e authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "MediaCodecInfo: Fix getSupportedSampleRates for null array"

parents 8a2b96bb 2e961480

media/java/android/media/MediaCodecInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ public final class MediaCodecInfo { 
         * {@code null}.  The array is sorted in ascending order.

         */

        public int[] getSupportedSampleRates() {

            return Arrays.copyOf(mSampleRates, mSampleRates.length);

            return mSampleRates != null ? Arrays.copyOf(mSampleRates, mSampleRates.length) : null;

        }



        /**