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

Commit b99ed40f authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android (Google) Code Review
Browse files

Merge "Camera: cleanup dead code"

parents 01208118 1a1a9b21

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ public class CameraDeviceImpl extends CameraDevice { 
            new SparseArray<CaptureCallbackHolder>();



    private int mRepeatingRequestId = REQUEST_ID_NONE;

    private final ArrayList<Integer> mRepeatingRequestIdDeletedList = new ArrayList<Integer>();

    // Map stream IDs to input/output configurations

    private SimpleEntry<Integer, InputConfiguration> mConfiguredInput =

            new SimpleEntry<>(REQUEST_ID_NONE, null);
@@ -916,11 +915,6 @@ public class CameraDeviceImpl extends CameraDevice { 
                int requestId = mRepeatingRequestId;

                mRepeatingRequestId = REQUEST_ID_NONE;



                // Queue for deletion after in-flight requests finish

                if (mCaptureCallbackMap.get(requestId) != null) {

                    mRepeatingRequestIdDeletedList.add(requestId);

                }



                try {

                    LongParcelable lastFrameNumberRef = new LongParcelable();

                    mRemoteDevice.cancelRequest(requestId, /*out*/lastFrameNumberRef);