Merge "Camera: skip unnecessary reconfig" am: b9e732b490 am: f694dc1b4a

am: e1655e5469

Change-Id: I396254dd546aaa7fb2147d60b95cbe8075059f23

services/camera/libcameraservice/api1/Camera2Client.cpp

@@ -780,6 +780,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
     int lastJpegStreamId = mJpegProcessor->getStreamId();
     // If jpeg stream will slow down preview, make sure we remove it before starting preview
     if (params.slowJpegMode) {
+        if (lastJpegStreamId != NO_STREAM) {
             // Pause preview if we are streaming
             int32_t activeRequestId = mStreamingProcessor->getActiveRequestId();
             if (activeRequestId != 0) {
@@ -809,6 +810,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
                             __FUNCTION__, mCameraId, strerror(-res), res);
                 }
             }
+        }
     } else {
         res = updateProcessorStream(mJpegProcessor, params);
         if (res != OK) {