commit 2db86ffaebed02c67a08c8c3bd8e265509cd8c05
author Shuzhen Wang <shuzhenwang@google.com> Wed Apr 25 01:11:17 2018 +0000
committer Shuzhen Wang <shuzhenwang@google.com> Wed Apr 25 01:12:35 2018 +0000
tree 850a1497330c4aca17eb69ac6d4c751e00d156ba
parent 9e3055dd2d3f8b47c7f0871d5b6b03c205a7f6fa

Revert "Camera: Use fully qualified name for camera eviction logic"

This reverts commit 9e3055dd2d3f8b47c7f0871d5b6b03c205a7f6fa.

Bug: 78528859
Bug: 78277539
Change-Id: I9b18760a5573b92676e688915ebf0fe0e1ce3010

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 83e56b6..c87b5eb 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1055,16 +1055,8 @@
             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(String8(cameraName.c_str()),
+        clientDescriptor = CameraClientManager::makeClientDescriptor(cameraId,
                 sp<BasicClient>{nullptr}, static_cast<int32_t>(state->getCost()),
                 state->getConflicting(),
                 priorityScores[priorityScores.size() - 1],