Merge "Camera: Make finalizeOutputConfigurations more resilient" into oc-dev

        surfaceId++;

    }

    // Gracefully handle case where finalizeOutputConfigurations is called

    // without any new surface.

    if (consumerSurfaces.size() == 0) {

        mStreamInfoMap[streamId].finalized = true;

        return res;

    }

    // Finish the deferred stream configuration with the surface.

    status_t err;

    err = mDevice->setConsumerSurfaces(streamId, consumerSurfaces);