Automated import from //branches/master/...@141599,141599 (6023a5c6) · Commits · e / os / android_frameworks_native-old

camera/libcameraservice/CameraService.cpp

+12 −5

Original line number	Diff line number	Diff line
		@@ -283,8 +283,14 @@ CameraService::Client::~Client()
		#endif
		}

		if (mMediaPlayerBeep.get() != NULL) {
		mMediaPlayerBeep->disconnect();
		mMediaPlayerBeep.clear();
		}
		if (mMediaPlayerClick.get() != NULL) {
		mMediaPlayerClick->disconnect();
		mMediaPlayerClick.clear();
		}

		// make sure we tear down the hardware
		mClientPid = IPCThreadState::self()->getCallingPid();
		@@ -711,9 +717,6 @@ status_t CameraService::Client::takePicture()
		return INVALID_OPERATION;
		}

		if (mMediaPlayerClick.get() != NULL) {
		mMediaPlayerClick->start();
		}
		return mHardware->takePicture(shutterCallback,
		yuvPictureCallback,
		jpegPictureCallback,
		@@ -751,6 +754,10 @@ void CameraService::Client::shutterCallback(void *user)

		client->mSurface->registerBuffers(buffers);
		}

		if (client->mMediaPlayerClick.get() != NULL) {
		client->mMediaPlayerClick->start();
		}
		}

		// picture callback - raw image ready