Merge "frameworks/base: Add support for FM feature." into cm-10.2 (2c472238) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioSystem.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,8 @@ public class AudioSystem
		public static final int DEVICE_OUT_ANC_HEADSET = 0x10000;
		public static final int DEVICE_OUT_ANC_HEADPHONE = 0x20000;
		public static final int DEVICE_OUT_PROXY = 0x40000;
		public static final int DEVICE_OUT_FM = 0x80000;
		public static final int DEVICE_OUT_FM_TX = 0x100000;
		public static final int DEVICE_OUT_DEFAULT = DEVICE_BIT_DEFAULT;

		public static final int DEVICE_OUT_ALL = (DEVICE_OUT_EARPIECE \|
		@@ -253,6 +255,8 @@ public class AudioSystem
		DEVICE_OUT_ANC_HEADSET \|
		DEVICE_OUT_ANC_HEADPHONE \|
		DEVICE_OUT_PROXY \|
		DEVICE_OUT_FM \|
		DEVICE_OUT_FM_TX \|
		DEVICE_OUT_DEFAULT);
		public static final int DEVICE_OUT_ALL_A2DP = (DEVICE_OUT_BLUETOOTH_A2DP \|
		DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES \|
		@@ -279,6 +283,8 @@ public class AudioSystem
		public static final int DEVICE_IN_USB_DEVICE = DEVICE_BIT_IN \| 0x1000;
		public static final int DEVICE_IN_ANC_HEADSET = DEVICE_BIT_IN \| 0x2000;
		public static final int DEVICE_IN_PROXY = DEVICE_BIT_IN \| 0x4000;
		public static final int DEVICE_IN_FM_RX = DEVICE_BIT_IN \| 0x8000;
		public static final int DEVICE_IN_FM_RX_A2DP = DEVICE_BIT_IN \| 0x10000;
		public static final int DEVICE_IN_DEFAULT = DEVICE_BIT_IN \| DEVICE_BIT_DEFAULT;

		public static final int DEVICE_IN_ALL = (DEVICE_IN_COMMUNICATION \|
		@@ -296,6 +302,8 @@ public class AudioSystem
		DEVICE_IN_USB_DEVICE \|
		DEVICE_IN_ANC_HEADSET \|
		DEVICE_IN_PROXY \|
		DEVICE_IN_FM_RX \|
		DEVICE_IN_FM_RX_A2DP \|
		DEVICE_IN_DEFAULT);
		public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET;

		@@ -323,6 +331,8 @@ public class AudioSystem
		public static final String DEVICE_OUT_ANC_HEADSET_NAME = "anc_headset";
		public static final String DEVICE_OUT_ANC_HEADPHONE_NAME = "anc_headphone";
		public static final String DEVICE_OUT_PROXY_NAME = "proxy";
		public static final String DEVICE_OUT_FM_NAME = "fm";
		public static final String DEVICE_OUT_FM_TX_NAME = "fm_tx";

		public static String getDeviceName(int device)
		{
		@@ -365,6 +375,10 @@ public class AudioSystem
		return DEVICE_OUT_ANC_HEADPHONE_NAME;
		case DEVICE_OUT_PROXY:
		return DEVICE_OUT_PROXY_NAME;
		case DEVICE_OUT_FM:
		return DEVICE_OUT_FM_NAME;
		case DEVICE_OUT_FM_TX:
		return DEVICE_OUT_FM_TX_NAME;
		case DEVICE_OUT_DEFAULT:
		default:
		return "";

media/java/android/media/MediaRecorder.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -179,6 +179,18 @@ public class MediaRecorder
		* is applied.
		*/
		public static final int VOICE_COMMUNICATION = 7;

		/**
		* @hide
		* Audio source for remote submix.
		*/
		public static final int REMOTE_SUBMIX_SOURCE = 8;

		/** @hide */
		public static final int FM_RX = 9;

		/** @hide */
		public static final int FM_RX_A2DP = 10;
		}

		/**
		@@ -307,7 +319,10 @@ public class MediaRecorder
		* @see android.media.MediaRecorder.AudioSource
		*/
		public static final int getAudioSourceMax() {
		return AudioSource.VOICE_COMMUNICATION;
		// FIXME disable selection of the remote submxi source selection once test code
		// doesn't rely on it
		return AudioSource.FM_RX_A2DP;
		//return AudioSource.VOICE_COMMUNICATION;
		}

		/**