commit 92c06fceabfa47906aaa7c747dcdd6376ccec358
author Christopher Wiley <wiley@google.com> Thu Feb 11 15:40:05 2016 -0800
committer Christopher Wiley <wiley@google.com> Fri Feb 12 14:46:05 2016 -0800
tree d04126b97978d02442caa812e50ef20617bfd9a4
parent 0039bcf0c4f10b92917c26df70c7847f1ab0b51e

brillo: Don't even try contacting the camera proxy

This service isn't running, and every time we try, we spend
five seconds retrying to get a reference to a binder that
will never be registered with the service manager.

Bug: 26936651
Test: With this patch, 5 second pauses with logs disappear.

Change-Id: I9cc6b1b616f1b786c3bb4e687b1c742d31424684

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 5c490b2..2c53c1e 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -252,12 +252,14 @@
 }
 
 sp<ICameraServiceProxy> CameraService::getCameraServiceProxy() {
+    sp<ICameraServiceProxy> proxyBinder = nullptr;
+#ifndef __BRILLO__
     sp<IServiceManager> sm = defaultServiceManager();
     sp<IBinder> binder = sm->getService(String16("media.camera.proxy"));
-    if (binder == nullptr) {
-        return nullptr;
+    if (binder != nullptr) {
+        proxyBinder = interface_cast<ICameraServiceProxy>(binder);
     }
-    sp<ICameraServiceProxy> proxyBinder = interface_cast<ICameraServiceProxy>(binder);
+#endif
     return proxyBinder;
 }