Merge "Camera: Support all API1 compatible camera devices" into pi-dev

gugelfrei
TreeHugger Robot 6 years ago committed by Android (Google) Code Review
commit bb2eb09a4d

@ -39,9 +39,6 @@ namespace {
const std::string kLegacyProviderName("legacy/0");
const std::string kExternalProviderName("external/0");
// Slash-separated list of provider types to consider for use via the old camera API
const std::string kStandardProviderTypes("internal/legacy/external");
} // anonymous namespace
CameraProviderManager::HardwareServiceInteractionProxy
@ -101,10 +98,8 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
std::lock_guard<std::mutex> lock(mInterfaceMutex);
std::vector<std::string> deviceIds;
for (auto& provider : mProviders) {
if (kStandardProviderTypes.find(provider->getType()) != std::string::npos) {
for (auto& id : provider->mUniqueAPI1CompatibleCameraIds) {
deviceIds.push_back(id);
}
for (auto& id : provider->mUniqueAPI1CompatibleCameraIds) {
deviceIds.push_back(id);
}
}

Loading…
Cancel
Save