Merge "Deprecate certain AbstractCursor fields." into jb-dev

This commit is contained in:
Jeff Brown
2012-05-09 17:35:18 -07:00
committed by Android (Google) Code Review
2 changed files with 10 additions and 4 deletions

View File

@@ -7013,9 +7013,9 @@ package android.database {
method public void unregisterDataSetObserver(android.database.DataSetObserver);
field protected boolean mClosed;
field protected android.content.ContentResolver mContentResolver;
field protected java.lang.Long mCurrentRowID;
field protected deprecated java.lang.Long mCurrentRowID;
field protected int mPos;
field protected int mRowIdColumnIndex;
field protected deprecated int mRowIdColumnIndex;
field protected deprecated java.util.HashMap mUpdatedRows;
}

View File

@@ -44,14 +44,20 @@ public abstract class AbstractCursor implements CrossProcessCursor {
/**
* 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.
*/
@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.
*/
@Deprecated
protected Long mCurrentRowID;
protected boolean mClosed;
@@ -62,8 +68,8 @@ public abstract class AbstractCursor implements CrossProcessCursor {
private ContentObserver mSelfObserver;
private boolean mSelfObserverRegistered;
private DataSetObservable mDataSetObservable = new DataSetObservable();
private ContentObservable mContentObservable = new ContentObservable();
private final DataSetObservable mDataSetObservable = new DataSetObservable();
private final ContentObservable mContentObservable = new ContentObservable();
private Bundle mExtras = Bundle.EMPTY;