Merge "Camera: Fix condition check for min/max zoom ratios" into rvc-dev am:...

package android.hardware.camera2.params;

import static com.android.internal.util.Preconditions.checkArgumentInRange;

import static com.android.internal.util.Preconditions.checkArgumentNonnegative;

import static com.android.internal.util.Preconditions.checkArgumentPositive;

import android.annotation.NonNull;

import android.hardware.camera2.CameraCharacteristics;

                "maxStreamingWidth must be nonnegative");

        mMaxStreamingHeight = checkArgumentNonnegative(maxStreamingHeight,

                "maxStreamingHeight must be nonnegative");

        mMinZoomRatio = checkArgumentInRange(minZoomRatio, 0.0f, 1.0f,

                "minZoomRatio must be between 0.0f and 1.0f");

        mMaxZoomRatio = maxZoomRatio;

        if (minZoomRatio > maxZoomRatio) {

            throw new IllegalArgumentException("minZoomRatio " + minZoomRatio

                    + " is greater than maxZoomRatio " + maxZoomRatio);

        }

        mMinZoomRatio = checkArgumentPositive(minZoomRatio,

                "minZoomRatio must be positive");

        mMaxZoomRatio = checkArgumentPositive(maxZoomRatio,

                "maxZoomRatio must be positive");

    }

    /**