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

am: 8309dbdd00

Change-Id: Ie7fbe472cca128eff0ef5c56008fc8f2432e9a5e

services/camera/libcameraservice/common/CameraProviderManager.cpp

@@ -783,6 +783,18 @@ std::unique_ptr<CameraProviderManager::ProviderInfo::DeviceInfo>
                 name.c_str(), statusToString(status));
         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>(
         new DeviceInfoT(name, tagId, id, minorVersion, resourceCost,
                 cameraInterface));