Merge branch 'eclair' into eclair-release (68ad4eaa) · Commits · e / os / android_frameworks_native

camera/libcameraservice/CameraService.cpp

+16 −4

Original line number	Diff line number	Diff line
		@@ -669,9 +669,15 @@ status_t CameraService::Client::startRecording()
		LOGD("startRecording (pid %d)", getCallingPid());

		if (mMediaPlayerBeep.get() != NULL) {
		// do not play record jingle if stream volume is 0
		// (typically because ringer mode is silent).
		int index;
		AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index);
		if (index != 0) {
		mMediaPlayerBeep->seekTo(0);
		mMediaPlayerBeep->start();
		}
		}

		mHardware->enableMsgType(CAMERA_MSG_VIDEO_FRAME);

		@@ -888,9 +894,15 @@ void CameraService::Client::handleShutter(
		{
		// Play shutter sound.
		if (mMediaPlayerClick.get() != NULL) {
		// do not play shutter sound if stream volume is 0
		// (typically because ringer mode is silent).
		int index;
		AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index);
		if (index != 0) {
		mMediaPlayerClick->seekTo(0);
		mMediaPlayerClick->start();
		}
		}

		// Screen goes black after the buffer is unregistered.
		if (mSurface != 0 && !mUseOverlay) {

+5 −0

Original line number	Diff line number	Diff line
		@@ -515,6 +515,11 @@ void Layer::unlockPageFlip(
		dirtyRegion.andSelf(visibleRegionScreen);
		outDirtyRegion.orSelf(dirtyRegion);
		}
		if (visibleRegionScreen.isEmpty()) {
		// an invisible layer should not hold a freeze-lock
		// (because it may never be updated and thereore never release it)
		mFreezeLock.clear();
		}
		}

		void Layer::finishPageFlip()

+1 −1