Merge "CameraService: Add client name/pid to device open/close logging." into lmp-dev (4f62441d) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+7 −2

Original line number	Diff line number	Diff line
		@@ -57,8 +57,10 @@ Camera2ClientBase<TClientBase>::Camera2ClientBase(
		mSharedCameraCallbacks(remoteCallback),
		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);
		LOG_ALWAYS_FATAL_IF(mDevice == 0, "Device should never be NULL here.");
		}
		@@ -114,7 +116,10 @@ Camera2ClientBase<TClientBase>::~Camera2ClientBase() {

		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>

+3 −0

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

		protected:

		// The PID provided in the constructor call
		pid_t mInitialClientPid;

		virtual sp<IBinder> asBinderWrapper() {
		return IInterface::asBinder();
		}