commit ec96060c3b4b4d793c6599204ae4f639d065a57d
author Eino-Ville Talvala <etalvala@google.com> Tue Oct 15 11:46:16 2019 -0700
committer Eino-Ville Talvala <etalvala@google.com> Tue Oct 15 11:46:16 2019 -0700
tree d135ada8cd3bd4267f6e2679983b8a12284f2211
parent 4bebef8d593f62a5ee80cab04167f4a3ba3722d8

CameraService: Don't block on camera HAL start in all cases

When initially starting up, use tryGetService instead of getService to
avoid blocking camera service start in cases where the camera HAL is stuck.

Test: atest cameraservice_test && atest CameraManagerTest, with and without
  lazy camera HAL

Change-Id: I2ad5c542e77e748902cfb49f90a55620b29ad4cd

services/camera/libcameraservice/common/CameraProviderManager.h

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h
index f4cf667..13a8513 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.h
+++ b/services/camera/libcameraservice/common/CameraProviderManager.h
@@ -96,6 +96,10 @@
                 const std::string &serviceName,
                 const sp<hidl::manager::V1_0::IServiceNotification>
                 &notification) = 0;
+        // Will not wait for service to start if it's not already running
+        virtual sp<hardware::camera::provider::V2_4::ICameraProvider> tryGetService(
+                const std::string &serviceName) = 0;
+        // Will block for service if it exists but isn't running
         virtual sp<hardware::camera::provider::V2_4::ICameraProvider> getService(
                 const std::string &serviceName) = 0;
         virtual hardware::hidl_vec<hardware::hidl_string> listServices() = 0;
@@ -112,6 +116,10 @@
             return hardware::camera::provider::V2_4::ICameraProvider::registerForNotifications(
                     serviceName, notification);
         }
+        virtual sp<hardware::camera::provider::V2_4::ICameraProvider> tryGetService(
+                const std::string &serviceName) override {
+            return hardware::camera::provider::V2_4::ICameraProvider::tryGetService(serviceName);
+        }
         virtual sp<hardware::camera::provider::V2_4::ICameraProvider> getService(
                 const std::string &serviceName) override {
             return hardware::camera::provider::V2_4::ICameraProvider::getService(serviceName);