Manually discover virtual camera service
The virtual camera service is not declared in the VINTF manifest.
Currently libcameraservice only looks for declared AIDL ICameraProvider services
This CL checks if the virtual camera service is running and adds the
corresponding CameraProvider to the CameraProviderManager
Test: CameraProviderManagerTest.AidlVirtualCameraProviderDiscovered
Test: CameraProviderManagerTest.AidlVirtualCameraProviderDiscoveredOnInit
Bug: b/270352264
Change-Id: I15667ea18bc32c90f76c1e25faa5c42199495aab
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h
index 2a5e73b..fd04854 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.h
+++ b/services/camera/libcameraservice/common/CameraProviderManager.h
@@ -174,6 +174,24 @@
virtual hardware::hidl_vec<hardware::hidl_string> listServices() override;
};
+ // Proxy to inject fake services in test.
+ class AidlServiceInteractionProxy {
+ public:
+ // Returns the Aidl service with the given serviceName
+ virtual std::shared_ptr<aidl::android::hardware::camera::provider::ICameraProvider>
+ getAidlService(const std::string& serviceName) = 0;
+
+ virtual ~AidlServiceInteractionProxy() = default;
+ };
+
+ // Standard use case - call into the normal static methods which invoke
+ // the real service manager
+ class AidlServiceInteractionProxyImpl : public AidlServiceInteractionProxy {
+ public:
+ virtual std::shared_ptr<aidl::android::hardware::camera::provider::ICameraProvider>
+ getAidlService(const std::string& serviceName) override;
+ };
+
/**
* Listener interface for device/torch status changes
*/
@@ -209,7 +227,8 @@
* used for testing. The lifetime of the proxy must exceed the lifetime of the manager.
*/
status_t initialize(wp<StatusListener> listener,
- HidlServiceInteractionProxy *hidlProxy = &sHidlServiceInteractionProxy);
+ HidlServiceInteractionProxy* hidlProxy = &sHidlServiceInteractionProxy,
+ AidlServiceInteractionProxy* aidlProxy = &sAidlServiceInteractionProxy);
status_t getCameraIdIPCTransport(const std::string &id,
IPCTransport *providerTransport) const;
@@ -424,6 +443,7 @@
wp<StatusListener> mListener;
HidlServiceInteractionProxy* mHidlServiceProxy;
+ AidlServiceInteractionProxy* mAidlServiceProxy;
// Current overall Android device physical status
int64_t mDeviceState;
@@ -432,6 +452,7 @@
mutable std::mutex mProviderLifecycleLock;
static HidlServiceInteractionProxyImpl sHidlServiceInteractionProxy;
+ static AidlServiceInteractionProxyImpl sAidlServiceInteractionProxy;
struct HalCameraProvider {
// Empty parent struct for storing either aidl / hidl camera provider reference
@@ -868,6 +889,8 @@
status_t usbDeviceDetached(const std::string &usbDeviceId);
ndk::ScopedAStatus onAidlRegistration(const std::string& in_name,
const ::ndk::SpAIBinder& in_binder);
+
+ static bool isVirtualCameraHalEnabled();
};
} // namespace android