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

Commit d17862bc authored by TheScarastic's avatar TheScarastic Committed by Bruno Martins
Browse files

libcameraservice: force specific cam id for google face unlock 

Change-Id: I07d5ee39eff3ede13811b3f9c6e617f7a3bac21e
parent ae97fa75

services/camera/libcameraservice/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ ifeq ($(TARGET_HAS_LEGACY_CAMERA_HAL1),true) 
    LOCAL_CFLAGS += -DNO_CAMERA_SERVER

endif



ifneq ($(TARGET_FACE_UNLOCK_CAMERA_ID),)

    LOCAL_CFLAGS += -DFACE_UNLOCK_CAMERA_ID=$(TARGET_FACE_UNLOCK_CAMERA_ID)

endif



LOCAL_MODULE:= libcameraservice



include $(BUILD_SHARED_LIBRARY)

services/camera/libcameraservice/CameraService.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1205,6 +1205,14 @@ Status CameraService::connect( 
    Status ret = Status::ok();



    String8 id = cameraIdIntToStr(api1CameraId);



#ifdef FACE_UNLOCK_CAMERA_ID

    if (strcmp16(clientPackageName, String16("com.android.facelock")) == 0 &&

           api1CameraId == 1) {

        id = cameraIdIntToStr(FACE_UNLOCK_CAMERA_ID);

    }

#endif



    sp<Client> client = nullptr;

    ret = connectHelper<ICameraClient,Client>(cameraClient, id, api1CameraId,

            CAMERA_HAL_API_VERSION_UNSPECIFIED, clientPackageName, clientUid, clientPid, API_1,