Merge branch 'master' into froyo-release (7fb3e853) · Commits · e / os / android_frameworks_native-old

libs/audioflinger/AudioPolicyManagerBase.cpp

+17 −0

Original line number	Diff line number	Diff line
		@@ -1435,6 +1435,15 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy,
		if (device) break;
		device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET;
		if (device) break;
		#ifdef WITH_A2DP
		// when not in a phone call, phone strategy should route STREAM_VOICE_CALL to A2DP
		if (mPhoneState != AudioSystem::MODE_IN_CALL) {
		device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP;
		if (device) break;
		device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES;
		if (device) break;
		}
		#endif
		device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_EARPIECE;
		if (device == 0) {
		LOGE("getDeviceForStrategy() earpiece device not found");
		@@ -1446,6 +1455,14 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy,
		device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_CARKIT;
		if (device) break;
		}
		#ifdef WITH_A2DP
		// when not in a phone call, phone strategy should route STREAM_VOICE_CALL to
		// A2DP speaker when forcing to speaker output
		if (mPhoneState != AudioSystem::MODE_IN_CALL) {
		device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;
		if (device) break;
		}
		#endif
		device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_SPEAKER;
		if (device == 0) {
		LOGE("getDeviceForStrategy() speaker device not found");

+48 −31

Original line number	Diff line number	Diff line
		@@ -466,14 +466,24 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions)
		return;
		}

		// ouch, this really should never happen
		if (uint32_t(buf)>=NUM_BUFFERS) {
		LOGE("retireAndLock() buffer index (%d) out of range", buf);
		mPostedDirtyRegion.clear();
		return;
		}

		// we retired a buffer, which becomes the new front buffer
		mFrontBufferIndex = buf;

		// get the dirty region
		sp<GraphicBuffer> newFrontBuffer(getBuffer(buf));
		if (newFrontBuffer != NULL) {
		// compute the posted region
		const Region dirty(lcblk->getDirtyRegion(buf));
		mPostedDirtyRegion = dirty.intersect( newFrontBuffer->getBounds() );

		// update the layer size and release freeze-lock
		const Layer::State& front(drawingState());
		if (newFrontBuffer->getWidth() == front.requested_w &&
		newFrontBuffer->getHeight() == front.requested_h)
		@@ -504,6 +514,13 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions)
		// we now have the correct size, unfreeze the screen
		mFreezeLock.clear();
		}
		} else {
		// this should not happen unless we ran out of memory while
		// allocating the buffer. we're hoping that things will get back
		// to normal the next time the app tries to draw into this buffer.
		// meanwhile, pretend the screen didn't update.
		mPostedDirtyRegion.clear();
		}

		if (lcblk->getQueuedCount()) {
		// signal an event if we have more buffers waiting