commit 0c65440126a3679d98c321f4d8493fd820e3a91c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 08 21:46:03 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 08 21:46:03 2016 +0000
tree 57a38c13f32d3f2d9e118d5c1db48a6a0773c190
parent 8526d86ab12284135ed4ca27aeb816371c10c0e6
parent f4db13db84c40299de4f9997f08d05259bdb8716

Merge "Camera service: Speed up camera service startup on boot"

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 85faac6..86c48a4 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -276,7 +276,10 @@
     sp<ICameraServiceProxy> proxyBinder = nullptr;
 #ifndef __BRILLO__
     sp<IServiceManager> sm = defaultServiceManager();
-    sp<IBinder> binder = sm->getService(String16("media.camera.proxy"));
+    // Use checkService because cameraserver normally starts before the
+    // system server and the proxy service. So the long timeout that getService
+    // has before giving up is inappropriate.
+    sp<IBinder> binder = sm->checkService(String16("media.camera.proxy"));
     if (binder != nullptr) {
         proxyBinder = interface_cast<ICameraServiceProxy>(binder);
     }