Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev

  }

  public class CaptureFailure {

    method public int getFrameNumber();

    method public long getFrameNumber();

    method public int getReason();

    method public android.hardware.camera2.CaptureRequest getRequest();

    method public int getSequenceId();

    private final int mReason;

    private final boolean mDropped;

    private final int mSequenceId;

    private final int mFrameNumber;

    private final long mFrameNumber;

    /**

     * @hide

     */

    public CaptureFailure(CaptureRequest request, int reason, boolean dropped, int sequenceId,

            int frameNumber) {

            long frameNumber) {

        mRequest = request;

        mReason = reason;

        mDropped = dropped;

     * for every new result or failure; and the scope is the lifetime of the

     * {@link CameraDevice}.</p>

     *

     * @return int frame number

     * @return long frame number

     */

    public int getFrameNumber() {

    public long getFrameNumber() {

        return mFrameNumber;

    }