Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3e9ee23 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

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

parents 571d4cbe 7873d5b3

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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;

  }

























core/java/android/database/AbstractCursor.java



+8
−2




























Original line number
Diff line number
Diff line








@@ -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;