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

Commit ef4b27d1 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix performance-for-range-copy warnings" am: 1ce37f1d am: c9584831 

am: 538d5326

Change-Id: I15dfaa7eb997c7caf497b488384477952513cef7
parents dd44e3c5 538d5326

camera/ndk/impl/ACameraDevice.cpp

+3 −3
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu 
    }



    std::set<std::pair<ANativeWindow*, OutputConfiguration>> outputSet;

    for (auto outConfig : outputs->mOutputs) {

    for (const auto& outConfig : outputs->mOutputs) {

        ANativeWindow* anw = outConfig.mWindow;

        sp<IGraphicBufferProducer> iGBP(nullptr);

        ret = getIGBPfromAnw(anw, iGBP);
@@ -706,7 +706,7 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu 
    }



    // add new streams

    for (auto outputPair : addSet) {

    for (const auto& outputPair : addSet) {

        int streamId;

        remoteRet = mRemote->createStream(outputPair.second, &streamId);

        if (!remoteRet.isOk()) {
@@ -839,7 +839,7 @@ CameraDevice::onCaptureErrorLocked( 


        const auto& gbps = outputPairIt->second.second.getGraphicBufferProducers();

        for (const auto& outGbp : gbps) {

            for (auto surface : request->mSurfaceList) {

            for (const auto& surface : request->mSurfaceList) {

                if (surface->getIGraphicBufferProducer() == outGbp) {

                    ANativeWindow* anw = static_cast<ANativeWindow*>(surface.get());

                    ALOGV("Camera %s Lost output buffer for ANW %p frame %" PRId64,

media/libeffects/config/src/EffectsConfig.cpp

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ ParsingResult parse(const char* path) { 
        return parseWithPath(path);

    }



    for (std::string location : DEFAULT_LOCATIONS) {

    for (const std::string& location : DEFAULT_LOCATIONS) {

        std::string defaultPath = location + '/' + DEFAULT_NAME;

        if (access(defaultPath.c_str(), R_OK) != 0) {

            continue;

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ binder::Status CameraDeviceClient::submitRequestList( 
        Vector<int32_t> outputStreamIds;

        std::vector<std::string> requestedPhysicalIds;

        if (request.mSurfaceList.size() > 0) {

            for (sp<Surface> surface : request.mSurfaceList) {

            for (const sp<Surface>& surface : request.mSurfaceList) {

                if (surface == 0) continue;



                int32_t streamId;

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ status_t Camera3Device::initialize(sp<CameraProviderManager> manager, const Stri 
        session->interfaceChain([](

            ::android::hardware::hidl_vec<::android::hardware::hidl_string> interfaceChain) {

                ALOGV("Session interface chain:");

                for (auto iface : interfaceChain) {

                for (const auto& iface : interfaceChain) {

                    ALOGV("  %s", iface.c_str());

                }

            });

services/oboeservice/AAudioEndpointManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ sp<AAudioServiceEndpoint> AAudioEndpointManager::findExclusiveEndpoint_l( 
        const AAudioStreamConfiguration &configuration) {

    sp<AAudioServiceEndpoint> endpoint;

    mExclusiveSearchCount++;

    for (const auto ep : mExclusiveStreams) {

    for (const auto& ep : mExclusiveStreams) {

        if (ep->matches(configuration)) {

            mExclusiveFoundCount++;

            endpoint = ep;
@@ -126,7 +126,7 @@ sp<AAudioServiceEndpointShared> AAudioEndpointManager::findSharedEndpoint_l( 
        const AAudioStreamConfiguration &configuration) {

    sp<AAudioServiceEndpointShared> endpoint;

    mSharedSearchCount++;

    for (const auto ep  : mSharedStreams) {

    for (const auto& ep  : mSharedStreams) {

        if (ep->matches(configuration)) {

            mSharedFoundCount++;

            endpoint = ep;