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

api/current.xml

+65 −0

Original line number	Diff line number	Diff line
		@@ -14970,6 +14970,71 @@
		>
		</method>
		</interface>
		<class name="AccountManagerResponse"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.os.Parcelable">
		</implements>
		<method name="describeContents"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="onError"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="errorCode" type="int">
		</parameter>
		<parameter name="errorMessage" type="java.lang.String">
		</parameter>
		</method>
		<method name="onResult"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="result" type="android.os.Bundle">
		</parameter>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="dest" type="android.os.Parcel">
		</parameter>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		</class>
		<class name="AccountsException"
		extends="java.lang.Exception"
		abstract="false"

+7 −3

Original line number	Diff line number	Diff line
		@@ -22,16 +22,17 @@ import android.os.Parcelable;
		import android.os.RemoteException;

		/**
		* Object that wraps calls to an {@link android.accounts.IAccountManagerResponse} object.
		* @hide
		* Used by Account Authenticators to return a response.
		*/
		public class AccountManagerResponse implements Parcelable {
		private IAccountManagerResponse mResponse;

		/** @hide */
		public AccountManagerResponse(IAccountManagerResponse response) {
		mResponse = response;
		}

		/** @hide */
		public AccountManagerResponse(Parcel parcel) {
		mResponse =
		IAccountManagerResponse.Stub.asInterface(parcel.readStrongBinder());
		@@ -53,14 +54,17 @@ public class AccountManagerResponse implements Parcelable {
		}
		}

		/** @hide */
		public int describeContents() {
		return 0;
		}

		/** @hide */
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeStrongBinder(mResponse.asBinder());
		}

		/** @hide */
		public static final Creator<AccountManagerResponse> CREATOR =
		new Creator<AccountManagerResponse>() {
		public AccountManagerResponse createFromParcel(Parcel source) {

+6 −2

Original line number	Diff line number	Diff line
		@@ -545,8 +545,12 @@ public class ContentProviderOperation implements Parcelable {
		"only updates, deletes, and asserts can have selections");
		}
		mSelection = selection;
		if (selectionArgs == null) {
		mSelectionArgs = null;
		} else {
		mSelectionArgs = new String[selectionArgs.length];
		System.arraycopy(selectionArgs, 0, mSelectionArgs, 0, selectionArgs.length);
		}
		return this;
		}

+18 −1

Original line number	Diff line number	Diff line
		@@ -225,7 +225,10 @@ MediaPlayerService::~MediaPlayerService()
		sp<IMediaRecorder> MediaPlayerService::createMediaRecorder(pid_t pid)
		{
		#ifndef NO_OPENCORE
		sp<MediaRecorderClient> recorder = new MediaRecorderClient(pid);
		sp<MediaRecorderClient> recorder = new MediaRecorderClient(this, pid);
		wp<MediaRecorderClient> w = recorder;
		Mutex::Autolock lock(mLock);
		mMediaRecorderClients.add(w);
		#else
		sp<MediaRecorderClient> recorder = NULL;
		#endif
		@@ -233,6 +236,13 @@ sp<IMediaRecorder> MediaPlayerService::createMediaRecorder(pid_t pid)
		return recorder;
		}

		void MediaPlayerService::removeMediaRecorderClient(wp<MediaRecorderClient> client)
		{
		Mutex::Autolock lock(mLock);
		mMediaRecorderClients.remove(client);
		LOGV("Delete media recorder client");
		}

		sp<IMediaMetadataRetriever> MediaPlayerService::createMetadataRetriever(pid_t pid)
		{
		sp<MetadataRetrieverClient> retriever = new MetadataRetrieverClient(pid);
		@@ -460,6 +470,13 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args)
		sp<Client> c = mClients[i].promote();
		if (c != 0) c->dump(fd, args);
		}
		for (int i = 0, n = mMediaRecorderClients.size(); i < n; ++i) {
		result.append(" MediaRecorderClient\n");
		sp<MediaRecorderClient> c = mMediaRecorderClients[i].promote();
		snprintf(buffer, 255, " pid(%d)\n\n", c->mPid);
		result.append(buffer);
		}

		result.append(" Files opened and/or mapped:\n");
		snprintf(buffer, SIZE, "/proc/%d/maps", myTid());
		FILE *f = fopen(buffer, "r");

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ namespace android {
		class IMediaRecorder;
		class IMediaMetadataRetriever;
		class IOMX;
		class MediaRecorderClient;

		#define CALLBACK_ANTAGONIZER 0
		#if CALLBACK_ANTAGONIZER
		@@ -175,6 +176,7 @@ public:

		// IMediaPlayerService interface
		virtual sp<IMediaRecorder> createMediaRecorder(pid_t pid);
		void removeMediaRecorderClient(wp<MediaRecorderClient> client);
		virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid);

		// House keeping for media player clients
		@@ -280,6 +282,7 @@ private:

		mutable Mutex mLock;
		SortedVector< wp<Client> > mClients;
		SortedVector< wp<MediaRecorderClient> > mMediaRecorderClients;
		int32_t mNextConnId;
		};