Commit 5740d1a4 authored Dec 10, 2009 by Jean-Michel Trivi Committed by Android Git Automerger Dec 10, 2009

am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair

Merge commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b' into eclair-mr2-plus-aosp

* commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b':
  Partially fix bug 2111240 Detect docking / undocking event by reporting

parents 33b94958 3869dcba

include/media/AudioSystem.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -282,6 +282,7 @@ public:
		FORCE_BT_SCO,
		FORCE_BT_A2DP,
		FORCE_WIRED_ACCESSORY,
		FORCE_BT_DOCK,
		NUM_FORCE_CONFIG,
		FORCE_DEFAULT = FORCE_NONE
		};
		@@ -291,6 +292,7 @@ public:
		FOR_COMMUNICATION,
		FOR_MEDIA,
		FOR_RECORD,
		FOR_DOCK,
		NUM_FORCE_USE
		};