Merge "Expose Cursor.setExtras()." (cb0392fa) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −2

Original line number	Diff line number	Diff line
		@@ -9726,6 +9726,7 @@ package android.database {
		method public void registerDataSetObserver(android.database.DataSetObserver);
		method public boolean requery();
		method public android.os.Bundle respond(android.os.Bundle);
		method public void setExtras(android.os.Bundle);
		method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
		method public void unregisterContentObserver(android.database.ContentObserver);
		method public void unregisterDataSetObserver(android.database.DataSetObserver);
		@@ -9831,6 +9832,7 @@ package android.database {
		method public abstract void registerDataSetObserver(android.database.DataSetObserver);
		method public abstract deprecated boolean requery();
		method public abstract android.os.Bundle respond(android.os.Bundle);
		method public abstract void setExtras(android.os.Bundle);
		method public abstract void setNotificationUri(android.content.ContentResolver, android.net.Uri);
		method public abstract void unregisterContentObserver(android.database.ContentObserver);
		method public abstract void unregisterDataSetObserver(android.database.DataSetObserver);
		@@ -9902,7 +9904,7 @@ package android.database {
		ctor public CursorWrapper(android.database.Cursor);
		method public void close();
		method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
		method public void deactivate();
		method public deprecated void deactivate();
		method public byte[] getBlob(int);
		method public int getColumnCount();
		method public int getColumnIndex(java.lang.String);
		@@ -9936,8 +9938,9 @@ package android.database {
		method public boolean moveToPrevious();
		method public void registerContentObserver(android.database.ContentObserver);
		method public void registerDataSetObserver(android.database.DataSetObserver);
		method public boolean requery();
		method public deprecated boolean requery();
		method public android.os.Bundle respond(android.os.Bundle);
		method public void setExtras(android.os.Bundle);
		method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
		method public void unregisterContentObserver(android.database.ContentObserver);
		method public void unregisterDataSetObserver(android.database.DataSetObserver);

api/system-current.txt

+5 −2

Original line number	Diff line number	Diff line
		@@ -10017,6 +10017,7 @@ package android.database {
		method public void registerDataSetObserver(android.database.DataSetObserver);
		method public boolean requery();
		method public android.os.Bundle respond(android.os.Bundle);
		method public void setExtras(android.os.Bundle);
		method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
		method public void unregisterContentObserver(android.database.ContentObserver);
		method public void unregisterDataSetObserver(android.database.DataSetObserver);
		@@ -10122,6 +10123,7 @@ package android.database {
		method public abstract void registerDataSetObserver(android.database.DataSetObserver);
		method public abstract deprecated boolean requery();
		method public abstract android.os.Bundle respond(android.os.Bundle);
		method public abstract void setExtras(android.os.Bundle);
		method public abstract void setNotificationUri(android.content.ContentResolver, android.net.Uri);
		method public abstract void unregisterContentObserver(android.database.ContentObserver);
		method public abstract void unregisterDataSetObserver(android.database.DataSetObserver);
		@@ -10193,7 +10195,7 @@ package android.database {
		ctor public CursorWrapper(android.database.Cursor);
		method public void close();
		method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
		method public void deactivate();
		method public deprecated void deactivate();
		method public byte[] getBlob(int);
		method public int getColumnCount();
		method public int getColumnIndex(java.lang.String);
		@@ -10227,8 +10229,9 @@ package android.database {
		method public boolean moveToPrevious();
		method public void registerContentObserver(android.database.ContentObserver);
		method public void registerDataSetObserver(android.database.DataSetObserver);
		method public boolean requery();
		method public deprecated boolean requery();
		method public android.os.Bundle respond(android.os.Bundle);
		method public void setExtras(android.os.Bundle);
		method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
		method public void unregisterContentObserver(android.database.ContentObserver);
		method public void unregisterDataSetObserver(android.database.DataSetObserver);

core/java/android/database/AbstractCursor.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -404,31 +404,29 @@ public abstract class AbstractCursor implements CrossProcessCursor {
		}
		}

		@Override
		public Uri getNotificationUri() {
		synchronized (mSelfObserverLock) {
		return mNotifyUri;
		}
		}

		@Override
		public boolean getWantsAllOnMoveCalls() {
		return false;
		}

		/**
		* Sets a {@link Bundle} that will be returned by {@link #getExtras()}. <code>null</code> will
		* be converted into {@link Bundle#EMPTY}.
		*
		* @param extras {@link Bundle} to set.
		* @hide
		*/
		@Override
		public void setExtras(Bundle extras) {
		mExtras = (extras == null) ? Bundle.EMPTY : extras;
		}

		@Override
		public Bundle getExtras() {
		return mExtras;
		}

		@Override
		public Bundle respond(Bundle extras) {
		return Bundle.EMPTY;
		}

core/java/android/database/Cursor.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -443,6 +443,13 @@ public interface Cursor extends Closeable {
		*/
		boolean getWantsAllOnMoveCalls();

		/**
		* Sets a {@link Bundle} that will be returned by {@link #getExtras()}.
		*
		* @param extras {@link Bundle} to set, or null to set an empty bundle.
		*/
		void setExtras(Bundle extras);

		/**
		* Returns a bundle of extra values. This is an optional way for cursors to provide out-of-band
		* metadata to their users. One use of this is for reporting on the progress of network requests

core/java/android/database/CursorWrapper.java

+51 −4

Original line number	Diff line number	Diff line
		@@ -45,163 +45,210 @@ public class CursorWrapper implements Cursor {
		return mCursor;
		}

		@Override
		public void close() {
		mCursor.close();
		}

		@Override
		public boolean isClosed() {
		return mCursor.isClosed();
		}

		@Override
		public int getCount() {
		return mCursor.getCount();
		}

		@Override
		@Deprecated
		public void deactivate() {
		mCursor.deactivate();
		}

		@Override
		public boolean moveToFirst() {
		return mCursor.moveToFirst();
		}

		@Override
		public int getColumnCount() {
		return mCursor.getColumnCount();
		}

		@Override
		public int getColumnIndex(String columnName) {
		return mCursor.getColumnIndex(columnName);
		}

		@Override
		public int getColumnIndexOrThrow(String columnName)
		throws IllegalArgumentException {
		return mCursor.getColumnIndexOrThrow(columnName);
		}

		@Override
		public String getColumnName(int columnIndex) {
		return mCursor.getColumnName(columnIndex);
		}

		@Override
		public String[] getColumnNames() {
		return mCursor.getColumnNames();
		}

		@Override
		public double getDouble(int columnIndex) {
		return mCursor.getDouble(columnIndex);
		}

		@Override
		public void setExtras(Bundle extras) {
		mCursor.setExtras(extras);
		}

		@Override
		public Bundle getExtras() {
		return mCursor.getExtras();
		}

		@Override
		public float getFloat(int columnIndex) {
		return mCursor.getFloat(columnIndex);
		}

		@Override
		public int getInt(int columnIndex) {
		return mCursor.getInt(columnIndex);
		}

		@Override
		public long getLong(int columnIndex) {
		return mCursor.getLong(columnIndex);
		}

		@Override
		public short getShort(int columnIndex) {
		return mCursor.getShort(columnIndex);
		}

		@Override
		public String getString(int columnIndex) {
		return mCursor.getString(columnIndex);
		}

		@Override
		public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
		mCursor.copyStringToBuffer(columnIndex, buffer);
		}

		@Override
		public byte[] getBlob(int columnIndex) {
		return mCursor.getBlob(columnIndex);
		}

		@Override
		public boolean getWantsAllOnMoveCalls() {
		return mCursor.getWantsAllOnMoveCalls();
		}

		@Override
		public boolean isAfterLast() {
		return mCursor.isAfterLast();
		}

		@Override
		public boolean isBeforeFirst() {
		return mCursor.isBeforeFirst();
		}

		@Override
		public boolean isFirst() {
		return mCursor.isFirst();
		}

		@Override
		public boolean isLast() {
		return mCursor.isLast();
		}

		@Override
		public int getType(int columnIndex) {
		return mCursor.getType(columnIndex);
		}

		@Override
		public boolean isNull(int columnIndex) {
		return mCursor.isNull(columnIndex);
		}

		@Override
		public boolean moveToLast() {
		return mCursor.moveToLast();
		}

		@Override
		public boolean move(int offset) {
		return mCursor.move(offset);
		}

		@Override
		public boolean moveToPosition(int position) {
		return mCursor.moveToPosition(position);
		}

		@Override
		public boolean moveToNext() {
		return mCursor.moveToNext();
		}

		@Override
		public int getPosition() {
		return mCursor.getPosition();
		}

		@Override
		public boolean moveToPrevious() {
		return mCursor.moveToPrevious();
		}

		@Override
		public void registerContentObserver(ContentObserver observer) {
		mCursor.registerContentObserver(observer);
		}

		@Override
		public void registerDataSetObserver(DataSetObserver observer) {
		mCursor.registerDataSetObserver(observer);
		}

		@Override
		@Deprecated
		public boolean requery() {
		return mCursor.requery();
		}

		@Override
		public Bundle respond(Bundle extras) {
		return mCursor.respond(extras);
		}

		@Override
		public void setNotificationUri(ContentResolver cr, Uri uri) {
		mCursor.setNotificationUri(cr, uri);
		}

		@Override
		public Uri getNotificationUri() {
		return mCursor.getNotificationUri();
		}

		@Override
		public void unregisterContentObserver(ContentObserver observer) {
		mCursor.unregisterContentObserver(observer);
		}

		@Override
		public void unregisterDataSetObserver(DataSetObserver observer) {
		mCursor.unregisterDataSetObserver(observer);
		}