commit 0bd3852f91792eec434c0a2b68fa890a5c38500f
author Jayant Chowdhary <jchowdhary@google.com> Fri Nov 05 17:49:27 2021 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Thu Jan 20 12:06:33 2022 -0800
tree d43021b84a47c93170e07d43ad52709a8ad3bd85
parent 14929832fb2ca5284ae9faaef2dfe8f3eb3d4036

Make CameraProviderManager inner classes binder transport agnostic.

In preparation for supporting both aidl and hidl hals.

Bug: 196432585

Test: Camera CTS

Change-Id: Iabddc0cfdaaa95bd4b38125c276cd9c874b500ec
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 4c1e7f0..738cf53 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -65,6 +65,8 @@
 #include "utils/TraceHFR.h"
 #include "utils/CameraServiceProxyWrapper.h"
 
+#include "../common/hidl/HidlProviderInfo.h"
+
 #include <algorithm>
 #include <tuple>
 
@@ -126,7 +128,7 @@
 
     sp<ICameraDeviceSession> session;
     ATRACE_BEGIN("CameraHal::openSession");
-    status_t res = manager->openSession(mId.string(), this,
+    status_t res = manager->openHidlSession(mId.string(), this,
             /*out*/ &session);
     ATRACE_END();
     if (res != OK) {
@@ -3263,7 +3265,7 @@
         ALOGE("%s: Transaction error: %s", __FUNCTION__, err.description().c_str());
         res = DEAD_OBJECT;
     } else {
-        res = CameraProviderManager::mapToStatusT(status);
+        res = HidlProviderInfo::mapToStatusT(status);
     }
 
     return res;
@@ -3560,7 +3562,7 @@
     }
 
     if (status != common::V1_0::Status::OK ) {
-        return CameraProviderManager::mapToStatusT(status);
+        return HidlProviderInfo::mapToStatusT(status);
     }
 
     // And convert output stream configuration from HIDL
@@ -4049,7 +4051,7 @@
         status = common::V1_0::Status::INTERNAL_ERROR;
     }
 
-    res = CameraProviderManager::mapToStatusT(status);
+    res = HidlProviderInfo::mapToStatusT(status);
     if (res == OK) {
         if (mHidlSession->isRemote()) {
             // Only close acquire fence FDs when the HIDL transaction succeeds (so the FDs have been
@@ -4076,7 +4078,7 @@
         ALOGE("%s: Transaction error: %s", __FUNCTION__, err.description().c_str());
         res = DEAD_OBJECT;
     } else {
-        res = CameraProviderManager::mapToStatusT(err);
+        res = HidlProviderInfo::mapToStatusT(err);
     }
 
     return res;
@@ -4161,7 +4163,7 @@
         return DEAD_OBJECT;
     }
 
-    status_t ret = CameraProviderManager::mapToStatusT(status);
+    status_t ret = HidlProviderInfo::mapToStatusT(status);
     if (ret != OK) {
         return ret;
     }