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

Commit 8cd61147 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix mistyped exceptions; InvalidArgumentException"

parents 09c2b234 bef01e4b

media/java/android/media/PlaybackParams.java

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public final class PlaybackParams implements Parcelable { 
     * Sets the pitch factor.

     * @param pitch

     * @return this <code>PlaybackParams</code> instance.

     * @throws InvalidArgumentException if the pitch is negative

     * @throws IllegalArgumentException if the pitch is negative.

     */

    public PlaybackParams setPitch(float pitch) {

        if (pitch < 0.f) {

media/java/android/media/SyncParams.java

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public final class SyncParams { 
     *     the maximum deviation of the playback rate from the playback rate

     *     set. ({@code abs(actual_rate - set_rate) / set_rate})

     * @return this <code>SyncParams</code> instance.

     * @throws InvalidArgumentException if the tolerance is negative, or not less than one

     * @throws IllegalArgumentException if the tolerance is negative, or not less than one.

     */

    public SyncParams setTolerance(float tolerance) {

        if (tolerance < 0.f || tolerance >= 1.f) {

media/jni/android_media_MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,7 @@ static void android_media_MediaCodec_setVideoScalingMode( 


    if (mode != NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW

            && mode != NATIVE_WINDOW_SCALING_MODE_SCALE_CROP) {

        jniThrowException(env, "java/lang/InvalidArgumentException", NULL);

        jniThrowException(env, "java/lang/IllegalArgumentException", NULL);

        return;

    }