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

api/current.xml

+76 −466

Original line number	Original line	Diff line number	Diff line
	@@ -27216,88 +27216,6 @@
	</package>		</package>
	<package name="android.content"		<package name="android.content"
	>		>
	<class name="AbstractCursorEntityIterator"
	extends="java.lang.Object"
	abstract="true"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<implements name="android.content.EntityIterator">
	</implements>
	<constructor name="AbstractCursorEntityIterator"
	type="android.content.AbstractCursorEntityIterator"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="db" type="android.database.sqlite.SQLiteDatabase">
	</parameter>
	<parameter name="entityCursor" type="android.database.Cursor">
	</parameter>
	</constructor>
	<method name="close"
	return="void"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="hasNext"
	return="boolean"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="newEntityFromCursorLocked"
	return="android.content.Entity"
	abstract="true"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="cursor" type="android.database.Cursor">
	</parameter>
	</method>
	<method name="next"
	return="android.content.Entity"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="reset"
	return="void"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	</class>
	<class name="ActivityNotFoundException"		<class name="ActivityNotFoundException"
	extends="java.lang.RuntimeException"		extends="java.lang.RuntimeException"
	abstract="false"		abstract="false"
	@@ -27420,23 +27338,6 @@
	<parameter name="cursor" type="android.database.Cursor">		<parameter name="cursor" type="android.database.Cursor">
	</parameter>		</parameter>
	</method>		</method>
	<method name="onQueryEntitiesComplete"
	return="void"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="protected"
	>
	<parameter name="token" type="int">
	</parameter>
	<parameter name="cookie" type="java.lang.Object">
	</parameter>
	<parameter name="iterator" type="android.content.EntityIterator">
	</parameter>
	</method>
	<method name="onUpdateComplete"		<method name="onUpdateComplete"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -27519,29 +27420,6 @@
	<parameter name="orderBy" type="java.lang.String">		<parameter name="orderBy" type="java.lang.String">
	</parameter>		</parameter>
	</method>		</method>
	<method name="startQueryEntities"
	return="void"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="token" type="int">
	</parameter>
	<parameter name="cookie" type="java.lang.Object">
	</parameter>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="selection" type="java.lang.String">
	</parameter>
	<parameter name="selectionArgs" type="java.lang.String[]">
	</parameter>
	<parameter name="orderBy" type="java.lang.String">
	</parameter>
	</method>
	<method name="startUpdate"		<method name="startUpdate"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -28323,21 +28201,6 @@
	<parameter name="values" type="android.content.ContentValues">		<parameter name="values" type="android.content.ContentValues">
	</parameter>		</parameter>
	</method>		</method>
	<method name="insertEntity"
	return="android.net.Uri"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="entity" type="android.content.Entity">
	</parameter>
	</method>
	<method name="isTemporary"		<method name="isTemporary"
	return="boolean"		return="boolean"
	abstract="false"		abstract="false"
	@@ -28456,25 +28319,6 @@
	<parameter name="sortOrder" type="java.lang.String">		<parameter name="sortOrder" type="java.lang.String">
	</parameter>		</parameter>
	</method>		</method>
	<method name="queryEntities"
	return="android.content.EntityIterator"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="selection" type="java.lang.String">
	</parameter>
	<parameter name="selectionArgs" type="java.lang.String[]">
	</parameter>
	<parameter name="sortOrder" type="java.lang.String">
	</parameter>
	</method>
	<method name="setPathPermissions"		<method name="setPathPermissions"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -28533,21 +28377,6 @@
	<parameter name="selectionArgs" type="java.lang.String[]">		<parameter name="selectionArgs" type="java.lang.String[]">
	</parameter>		</parameter>
	</method>		</method>
	<method name="updateEntity"
	return="int"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="entity" type="android.content.Entity">
	</parameter>
	</method>
	</class>		</class>
	<class name="ContentProviderClient"		<class name="ContentProviderClient"
	extends="java.lang.Object"		extends="java.lang.Object"
	@@ -28653,23 +28482,6 @@
	<exception name="RemoteException" type="android.os.RemoteException">		<exception name="RemoteException" type="android.os.RemoteException">
	</exception>		</exception>
	</method>		</method>
	<method name="insertEntity"
	return="android.net.Uri"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="entity" type="android.content.Entity">
	</parameter>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	<method name="openAssetFile"		<method name="openAssetFile"
	return="android.content.res.AssetFileDescriptor"		return="android.content.res.AssetFileDescriptor"
	abstract="false"		abstract="false"
	@@ -28731,27 +28543,6 @@
	<exception name="RemoteException" type="android.os.RemoteException">		<exception name="RemoteException" type="android.os.RemoteException">
	</exception>		</exception>
	</method>		</method>
	<method name="queryEntities"
	return="android.content.EntityIterator"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="selection" type="java.lang.String">
	</parameter>
	<parameter name="selectionArgs" type="java.lang.String[]">
	</parameter>
	<parameter name="sortOrder" type="java.lang.String">
	</parameter>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	<method name="release"		<method name="release"
	return="boolean"		return="boolean"
	abstract="false"		abstract="false"
	@@ -28784,23 +28575,6 @@
	<exception name="RemoteException" type="android.os.RemoteException">		<exception name="RemoteException" type="android.os.RemoteException">
	</exception>		</exception>
	</method>		</method>
	<method name="updateEntity"
	return="int"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="entity" type="android.content.Entity">
	</parameter>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	</class>		</class>
	<class name="ContentProviderOperation"		<class name="ContentProviderOperation"
	extends="java.lang.Object"		extends="java.lang.Object"
	@@ -29689,27 +29463,6 @@
	<parameter name="sortOrder" type="java.lang.String">		<parameter name="sortOrder" type="java.lang.String">
	</parameter>		</parameter>
	</method>		</method>
	<method name="queryEntities"
	return="android.content.EntityIterator"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="selection" type="java.lang.String">
	</parameter>
	<parameter name="selectionArgs" type="java.lang.String[]">
	</parameter>
	<parameter name="sortOrder" type="java.lang.String">
	</parameter>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	<method name="registerContentObserver"		<method name="registerContentObserver"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -33171,199 +32924,6 @@
	</parameter>		</parameter>
	</method>		</method>
	</interface>		</interface>
	<class name="Entity"
	extends="java.lang.Object"
	abstract="false"
	static="false"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	<implements name="android.os.Parcelable">
	</implements>
	<constructor name="Entity"
	type="android.content.Entity"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="values" type="android.content.ContentValues">
	</parameter>
	</constructor>
	<method name="addSubValue"
	return="void"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="values" type="android.content.ContentValues">
	</parameter>
	</method>
	<method name="describeContents"
	return="int"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="getEntityValues"
	return="android.content.ContentValues"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="getSubValues"
	return="java.util.ArrayList<android.content.Entity.NamedContentValues>"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</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>
	<field name="CREATOR"
	type="android.os.Parcelable.Creator"
	transient="false"
	volatile="false"
	static="true"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	</field>
	</class>
	<class name="Entity.NamedContentValues"
	extends="java.lang.Object"
	abstract="false"
	static="true"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<constructor name="Entity.NamedContentValues"
	type="android.content.Entity.NamedContentValues"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="uri" type="android.net.Uri">
	</parameter>
	<parameter name="values" type="android.content.ContentValues">
	</parameter>
	</constructor>
	<field name="uri"
	type="android.net.Uri"
	transient="false"
	volatile="false"
	static="false"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	</field>
	<field name="values"
	type="android.content.ContentValues"
	transient="false"
	volatile="false"
	static="false"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	</field>
	</class>
	<interface name="EntityIterator"
	abstract="true"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<method name="close"
	return="void"
	abstract="true"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="hasNext"
	return="boolean"
	abstract="true"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	<method name="next"
	return="android.content.Entity"
	abstract="true"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	<method name="reset"
	return="void"
	abstract="true"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<exception name="RemoteException" type="android.os.RemoteException">
	</exception>
	</method>
	</interface>
	<class name="Intent"		<class name="Intent"
	extends="java.lang.Object"		extends="java.lang.Object"
	abstract="false"		abstract="false"
	@@ -78426,21 +77986,6 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
	<method name="invoke"
	return="int"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="request" type="android.os.Parcel">
	</parameter>
	<parameter name="reply" type="android.os.Parcel">
	</parameter>
	</method>
	<method name="isLooping"		<method name="isLooping"
	return="boolean"		return="boolean"
	abstract="false"		abstract="false"
	@@ -78463,17 +78008,6 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
	<method name="newRequest"
	return="android.os.Parcel"
	abstract="false"
	native="false"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</method>
	<method name="pause"		<method name="pause"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -115542,6 +115076,82 @@
	>		>
	</field>		</field>
	</class>		</class>
			<class name="ContactsContract.RawContacts.Entity"
			extends="java.lang.Object"
			abstract="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			<implements name="android.provider.BaseColumns">
			</implements>
			<field name="CONTENT_DIRECTORY"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""entity""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="DATA_ID"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""data_id""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			</class>
			<class name="ContactsContract.RawContactsEntity"
			extends="java.lang.Object"
			abstract="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			<implements name="android.provider.BaseColumns">
			</implements>
			<field name="CONTENT_TYPE"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""vnd.android.cursor.dir/raw_contact_entity""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="CONTENT_URI"
			type="android.net.Uri"
			transient="false"
			volatile="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="DATA_ID"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""data_id""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			</class>
	<class name="ContactsContract.Settings"		<class name="ContactsContract.Settings"
	extends="java.lang.Object"		extends="java.lang.Object"
	abstract="false"		abstract="false"

camera/libcameraservice/CameraHardwareStub.cpp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -368,6 +368,12 @@ CameraParameters CameraHardwareStub::getParameters() const
	return mParameters;		return mParameters;
	}		}

			status_t CameraHardwareStub::sendCommand(int32_t command, int32_t arg1,
			int32_t arg2)
			{
			return BAD_VALUE;
			}

	void CameraHardwareStub::release()		void CameraHardwareStub::release()
	{		{
	}		}

camera/libcameraservice/CameraHardwareStub.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,8 @@ public:
	virtual status_t dump(int fd, const Vector<String16>& args) const;		virtual status_t dump(int fd, const Vector<String16>& args) const;
	virtual status_t setParameters(const CameraParameters& params);		virtual status_t setParameters(const CameraParameters& params);
	virtual CameraParameters getParameters() const;		virtual CameraParameters getParameters() const;
			virtual status_t sendCommand(int32_t command, int32_t arg1,
			int32_t arg2);
	virtual void release();		virtual void release();

	static sp<CameraHardwareInterface> createInstance();		static sp<CameraHardwareInterface> createInstance();

camera/libcameraservice/CameraService.cpp

+18 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1134,6 +1134,21 @@ String8 CameraService::Client::getParameters() const
	return params;		return params;
	}		}

			status_t CameraService::Client::sendCommand(int32_t cmd, int32_t arg1, int32_t arg2)
			{
			LOGD("sendCommand (pid %d)", getCallingPid());
			Mutex::Autolock lock(mLock);
			status_t result = checkPid();
			if (result != NO_ERROR) return result;

			if (mHardware == 0) {
			LOGE("mHardware is NULL, returning.");
			return INVALID_OPERATION;
			}

			return mHardware->sendCommand(cmd, arg1, arg2);
			}

	void CameraService::Client::copyFrameAndPostCopiedFrame(sp<IMemoryHeap> heap, size_t offset, size_t size)		void CameraService::Client::copyFrameAndPostCopiedFrame(sp<IMemoryHeap> heap, size_t offset, size_t size)
	{		{
	LOGV("copyFrameAndPostCopiedFrame");		LOGV("copyFrameAndPostCopiedFrame");

camera/libcameraservice/CameraService.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -122,6 +122,9 @@ private:
	// get preview/capture parameters - key/value pairs		// get preview/capture parameters - key/value pairs
	virtual String8 getParameters() const;		virtual String8 getParameters() const;

			// send command to camera driver
			virtual status_t sendCommand(int32_t cmd, int32_t arg1, int32_t arg2);

	// our client...		// our client...
	const sp<ICameraClient>& getCameraClient() const { return mCameraClient; }		const sp<ICameraClient>& getCameraClient() const { return mCameraClient; }