Merge branch 'eclair' into eclair-release (170b45cb) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothA2dp.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,22 @@ public final class BluetoothA2dp {
		}
		}

		/** Check if any A2DP sink is in Non Disconnected state
		* i.e playing, connected, connecting, disconnecting.
		* @return a unmodifiable set of connected A2DP sinks, or null on error.
		* @hide
		*/
		public Set<BluetoothDevice> getNonDisconnectedSinks() {
		if (DBG) log("getNonDisconnectedSinks()");
		try {
		return Collections.unmodifiableSet(
		new HashSet<BluetoothDevice>(Arrays.asList(mService.getNonDisconnectedSinks())));
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		return null;
		}
		}

		/** Get the state of an A2DP sink
		* @param device Remote BT device.
		* @return State code, one of STATE_

core/java/android/bluetooth/IBluetoothA2dp.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ interface IBluetoothA2dp {
		boolean suspendSink(in BluetoothDevice device);
		boolean resumeSink(in BluetoothDevice device);
		BluetoothDevice[] getConnectedSinks(); // change to Set<> once AIDL supports
		BluetoothDevice[] getNonDisconnectedSinks(); // change to Set<> once AIDL supports
		int getSinkState(in BluetoothDevice device);
		boolean setSinkPriority(in BluetoothDevice device, int priority);
		int getSinkPriority(in BluetoothDevice device);

core/java/android/content/Context.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1142,7 +1142,6 @@ public abstract class Context {
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.accounts.AccountManager} for receiving intents at a
		* time of your choosing.
		* TODO STOPSHIP perform a final review of the the account apis before shipping
		*
		* @see #getSystemService
		* @see android.accounts.AccountManager

core/java/android/content/Intent.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -540,10 +540,33 @@ import java.util.Set;
		* {@link #putExtra}.
		*
		* <ul>
		* <li> {@link #EXTRA_TEMPLATE}
		* <li> {@link #EXTRA_ALARM_COUNT}
		* <li> {@link #EXTRA_BCC}
		* <li> {@link #EXTRA_CC}
		* <li> {@link #EXTRA_CHANGED_COMPONENT_NAME}
		* <li> {@link #EXTRA_DATA_REMOVED}
		* <li> {@link #EXTRA_DOCK_STATE}
		* <li> {@link #EXTRA_DOCK_STATE_CAR}
		* <li> {@link #EXTRA_DOCK_STATE_DESK}
		* <li> {@link #EXTRA_DOCK_STATE_UNDOCKED}
		* <li> {@link #EXTRA_DONT_KILL_APP}
		* <li> {@link #EXTRA_EMAIL}
		* <li> {@link #EXTRA_INITIAL_INTENTS}
		* <li> {@link #EXTRA_INTENT}
		* <li> {@link #EXTRA_KEY_EVENT}
		* <li> {@link #EXTRA_PHONE_NUMBER}
		* <li> {@link #EXTRA_REMOTE_INTENT_TOKEN}
		* <li> {@link #EXTRA_REPLACING}
		* <li> {@link #EXTRA_SHORTCUT_ICON}
		* <li> {@link #EXTRA_SHORTCUT_ICON_RESOURCE}
		* <li> {@link #EXTRA_SHORTCUT_INTENT}
		* <li> {@link #EXTRA_STREAM}
		* <li> {@link #EXTRA_SHORTCUT_NAME}
		* <li> {@link #EXTRA_SUBJECT}
		* <li> {@link #EXTRA_TEMPLATE}
		* <li> {@link #EXTRA_TEXT}
		* <li> {@link #EXTRA_TITLE}
		* <li> {@link #EXTRA_UID}
		* </ul>
		*
		* <h3>Flags</h3>

core/java/android/hardware/Camera.java

+18 −12

Original line number	Diff line number	Diff line
		@@ -930,8 +930,8 @@ public class Camera {
		/**
		* Gets the supported preview sizes.
		*
		* @return a List of Size object. null if preview size setting is not
		* supported.
		* @return a List of Size object. This method will always return a list
		* with at least one element.
		*/
		public List<Size> getSupportedPreviewSizes() {
		String str = get(KEY_PREVIEW_SIZE + SUPPORTED_VALUES_SUFFIX);
		@@ -1065,8 +1065,8 @@ public class Camera {
		/**
		* Gets the supported preview formats.
		*
		* @return a List of Integer objects. null if preview format setting is
		* not supported.
		* @return a List of Integer objects. This method will always return a
		* list with at least one element.
		*/
		public List<Integer> getSupportedPreviewFormats() {
		String str = get(KEY_PREVIEW_FORMAT + SUPPORTED_VALUES_SUFFIX);
		@@ -1104,8 +1104,8 @@ public class Camera {
		/**
		* Gets the supported picture sizes.
		*
		* @return a List of Size objects. null if picture size setting is not
		* supported.
		* @return a List of Size objects. This method will always return a list
		* with at least one element.
		*/
		public List<Size> getSupportedPictureSizes() {
		String str = get(KEY_PICTURE_SIZE + SUPPORTED_VALUES_SUFFIX);
		@@ -1143,12 +1143,18 @@ public class Camera {
		/**
		* Gets the supported picture formats.
		*
		* @return a List of Integer objects (values are PixelFormat.XXX). null
		* if picture setting is not supported.
		* @return a List of Integer objects (values are PixelFormat.XXX). This
		* method will always return a list with at least one element.
		*/
		public List<Integer> getSupportedPictureFormats() {
		String str = get(KEY_PICTURE_SIZE + SUPPORTED_VALUES_SUFFIX);
		return splitInt(str);
		String str = get(KEY_PICTURE_FORMAT + SUPPORTED_VALUES_SUFFIX);
		ArrayList<Integer> formats = new ArrayList<Integer>();
		for (String s : split(str)) {
		int f = pixelFormatForCameraFormat(s);
		if (f == PixelFormat.UNKNOWN) continue;
		formats.add(f);
		}
		return formats;
		}

		private String cameraFormatForPixelFormat(int pixel_format) {
		@@ -1443,8 +1449,8 @@ public class Camera {
		/**
		* Gets the supported focus modes.
		*
		* @return a List of FOCUS_MODE_XXX string constants. null if focus mode
		* setting is not supported.
		* @return a List of FOCUS_MODE_XXX string constants. This method will
		* always return a list with at least one element.
		*/
		public List<String> getSupportedFocusModes() {
		String str = get(KEY_FOCUS_MODE + SUPPORTED_VALUES_SUFFIX);