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

Commit b9d2f333 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

CameraService: Add client name/pid to device open/close logging. 

Bug: 15672812
Change-Id: I1162c6d9d0a1eea1dd32949a04c295b4941d2602
parent 67489d2f

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,10 @@ Camera2ClientBase<TClientBase>::Camera2ClientBase( 
        mSharedCameraCallbacks(remoteCallback),

        mSharedCameraCallbacks(remoteCallback),

        mDeviceVersion(cameraService->getDeviceVersion(cameraId))

        mDeviceVersion(cameraService->getDeviceVersion(cameraId))

{

{

    ALOGI("Camera %d: Opened", cameraId);

    ALOGI("Camera %d: Opened. Client: %s (PID %d, UID %d)", cameraId,

            String8(clientPackageName).string(), clientPid, clientUid);





    mInitialClientPid = clientPid;

    mDevice = CameraDeviceFactory::createDevice(cameraId);

    mDevice = CameraDeviceFactory::createDevice(cameraId);

    LOG_ALWAYS_FATAL_IF(mDevice == 0, "Device should never be NULL here.");

    LOG_ALWAYS_FATAL_IF(mDevice == 0, "Device should never be NULL here.");

}

}
@@ -114,7 +116,10 @@ Camera2ClientBase<TClientBase>::~Camera2ClientBase() { 




    disconnect();

    disconnect();





    ALOGI("Closed Camera %d", TClientBase::mCameraId);

    ALOGI("Closed Camera %d. Client was: %s (PID %d, UID %u)",

            TClientBase::mCameraId,

            String8(TClientBase::mClientPackageName).string(),

            mInitialClientPid, TClientBase::mClientUid);

}

}





template <typename TClientBase>

template <typename TClientBase>

services/camera/libcameraservice/common/Camera2ClientBase.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -107,6 +107,9 @@ public: 




protected:

protected:





    // The PID provided in the constructor call

    pid_t mInitialClientPid;



    virtual sp<IBinder> asBinderWrapper() {

    virtual sp<IBinder> asBinderWrapper() {

        return IInterface::asBinder();

        return IInterface::asBinder();

    }

    }