Merge "Remove deprecated fields in AbstractCursor." (004a1704) · Commits · e / os / android_frameworks_base

core/java/android/database/AbstractCursor.java

+4 −21

Original line number	Diff line number	Diff line
		@@ -35,32 +35,21 @@ public abstract class AbstractCursor implements CrossProcessCursor {
		private static final String TAG = "Cursor";

		/**
		* @deprecated This is never updated by this class and should not be used
		* @removed This field should not be used.
		*/
		@Deprecated
		protected HashMap<Long, Map<String, Object>> mUpdatedRows;

		protected int mPos;

		/**
		* This must be set to the index of the row ID column by any
		* subclass that wishes to support updates.
		*
		* @deprecated This field should not be used.
		* @removed This field should not be used.
		*/
		@Deprecated
		protected int mRowIdColumnIndex;

		/**
		* If {@link #mRowIdColumnIndex} is not -1 this contains contains the value of
		* the column at {@link #mRowIdColumnIndex} for the current row this cursor is
		* pointing at.
		*
		* @deprecated This field should not be used.
		* @removed This field should not be used.
		*/
		@Deprecated
		protected Long mCurrentRowID;

		protected int mPos;
		protected boolean mClosed;
		protected ContentResolver mContentResolver;
		private Uri mNotifyUri;
		@@ -183,9 +172,6 @@ public abstract class AbstractCursor implements CrossProcessCursor {
		/* Implementation */
		public AbstractCursor() {
		mPos = -1;
		mRowIdColumnIndex = -1;
		mCurrentRowID = null;
		mUpdatedRows = new HashMap<Long, Map<String, Object>>();
		}

		public final int getPosition() {
		@@ -216,9 +202,6 @@ public abstract class AbstractCursor implements CrossProcessCursor {
		mPos = -1;
		} else {
		mPos = position;
		if (mRowIdColumnIndex != -1) {
		mCurrentRowID = Long.valueOf(getLong(mRowIdColumnIndex));
		}
		}

		return result;

core/java/android/database/BulkCursorToCursorAdaptor.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ public final class BulkCursorToCursorAdaptor extends AbstractWindowedCursor {
		public void initialize(BulkCursorDescriptor d) {
		mBulkCursor = d.cursor;
		mColumns = d.columnNames;
		mRowIdColumnIndex = DatabaseUtils.findRowIdColumnIndex(mColumns);
		mWantsAllOnMoveCalls = d.wantsAllOnMoveCalls;
		mCount = d.count;
		if (d.window != null) {

core/java/android/database/sqlite/SQLiteCursor.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,6 @@ public class SQLiteCursor extends AbstractWindowedCursor {
		mQuery = query;

		mColumns = query.getColumnNames();
		mRowIdColumnIndex = DatabaseUtils.findRowIdColumnIndex(mColumns);
		}

		/**