commit 15ca784102df7fc8259509b564d8085273d2a340
author Christopher Wiley <wiley@google.com> Fri Feb 19 22:11:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 19 22:11:31 2016 +0000
tree 0159153a9c5768e791a7cd281f0b46485f8e4992
parent c25621f0e52dbf78159b5aa28b8c19ed6a7a053b
parent 92c06fceabfa47906aaa7c747dcdd6376ccec358

Merge "brillo: Don't even try contacting the camera proxy"

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 1cf1512..23ba20d 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;
 }