Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf34799f authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

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

am: 15ca7841

* commit '15ca7841':
  brillo: Don't even try contacting the camera proxy
parents 55363176 15ca7841

services/camera/libcameraservice/CameraService.cpp

+5 −3
Original line number Diff line number Diff line
@@ -253,12 +253,14 @@ void CameraService::onFirstRef() 
}



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;

}