Merge "Camera: Use short form camera id for conflicting devices" into pi-dev

                name.c_str(), statusToString(status));

                name.c_str(), statusToString(status));

        return nullptr;

        return nullptr;

    }

    }

    for (auto& conflictName : resourceCost.conflictingDevices) {

        uint16_t major, minor;

        std::string type, id;

        status_t res = parseDeviceName(conflictName, &major, &minor, &type, &id);

        if (res != OK) {

            ALOGE("%s: Failed to parse conflicting device %s", __FUNCTION__, conflictName.c_str());

            return nullptr;

        }

        conflictName = id;

    }

    return std::unique_ptr<DeviceInfo>(

    return std::unique_ptr<DeviceInfo>(

        new DeviceInfoT(name, tagId, id, minorVersion, resourceCost,

        new DeviceInfoT(name, tagId, id, minorVersion, resourceCost,

                cameraInterface));

                cameraInterface));