Camera: Use fully qualified name for camera eviction logic
The conflicting device names are fully qualified, but the current
camera id isn't. Make them consistent.
Test: Camera CTS
Bug: 78277539
Change-Id: I1baf8d39b95bb475ad6a25f2eae7d409efe5d239
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index c87b5eb..83e56b6 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1055,8 +1055,16 @@
return BAD_VALUE;
}
+ std::string cameraName;
+ err = mCameraProviderManager->getCameraDeviceName(
+ std::string(cameraId.c_str()), cameraName);
+ if (err != OK) {
+ ALOGE("%s: Failed to find camera device name for id %s: %d",
+ __FUNCTION__, cameraId.c_str(), err);
+ return err;
+ }
// Make descriptor for incoming client
- clientDescriptor = CameraClientManager::makeClientDescriptor(cameraId,
+ clientDescriptor = CameraClientManager::makeClientDescriptor(String8(cameraName.c_str()),
sp<BasicClient>{nullptr}, static_cast<int32_t>(state->getCost()),
state->getConflicting(),
priorityScores[priorityScores.size() - 1],