Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable casting for Note 4 #7

Open
wants to merge 13 commits into
base: pie
Choose a base branch
from
Prev Previous commit
Next Next commit
Revert "CameraService: Support hooks for motorized camera"
This reverts commit c24c924.
  • Loading branch information
ripee committed Jul 20, 2019
commit e60e40bb212517af0286b0be5d7b8a978fdd4ca8
3 changes: 1 addition & 2 deletions services/camera/libcameraservice/Android.mk
Original file line number Diff line number Diff line change
@@ -81,8 +81,7 @@ LOCAL_SHARED_LIBRARIES:= \
android.hardware.camera.device@1.0 \
android.hardware.camera.device@3.2 \
android.hardware.camera.device@3.3 \
android.hardware.camera.device@3.4 \
vendor.lineage.camera.motor@1.0
android.hardware.camera.device@3.4

ifeq ($(TARGET_USES_QTI_CAMERA_DEVICE), true)
LOCAL_CFLAGS += -DQTI_CAMERA_DEVICE
13 changes: 0 additions & 13 deletions services/camera/libcameraservice/CameraService.cpp
Original file line number Diff line number Diff line change
@@ -74,8 +74,6 @@
#include "utils/CameraTraces.h"
#include "utils/TagMonitor.h"

#include <vendor/lineage/camera/motor/1.0/ICameraMotor.h>

namespace {
const char* kPermissionServiceName = "permission";
}; // namespace anonymous
@@ -89,7 +87,6 @@ using hardware::ICameraServiceProxy;
using hardware::ICameraServiceListener;
using hardware::camera::common::V1_0::CameraDeviceStatus;
using hardware::camera::common::V1_0::TorchModeStatus;
using vendor::lineage::camera::motor::V1_0::ICameraMotor;

// ----------------------------------------------------------------------------
// Logging support -- this is for debugging only
@@ -1455,11 +1452,6 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
} else {
// Otherwise, add client to active clients list
finishConnectLocked(client, partial);

sp<ICameraMotor> cameraMotor = ICameraMotor::getService();
if (cameraMotor != nullptr) {
cameraMotor->onConnect(cameraId.string());
}
}
} // lock is destroyed, allow further connect calls

@@ -2230,11 +2222,6 @@ binder::Status CameraService::BasicClient::disconnect() {
}
mDisconnected = true;

sp<ICameraMotor> cameraMotor = ICameraMotor::getService();
if (cameraMotor != nullptr) {
cameraMotor->onDisconnect(mCameraIdStr.string());
}

sCameraService->removeByClient(this);
sCameraService->logDisconnected(mCameraIdStr, mClientPid,
String8(mClientPackageName));