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

Commit 2c6b3b0c authored by Jeff Hamilton's avatar Jeff Hamilton Committed by The Android Open Source Project
Browse files

Automated import from //branches/master/...@141107,141107

parent 95e4f706

api/3.xml

+3 −3
Original line number Diff line number Diff line
@@ -125608,7 +125608,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -125652,7 +125652,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -125665,7 +125665,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

api/current.xml

+3 −3
Original line number Diff line number Diff line
@@ -146598,7 +146598,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -146642,7 +146642,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -146655,7 +146655,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

core/java/android/widget/CursorAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public abstract class CursorAdapter extends BaseAdapter implements Filterable, 
    /**

     * @see android.widget.ListAdapter#getCount()

     */

    public final int getCount() {

    public int getCount() {

        if (mDataValid && mCursor != null) {

            return mCursor.getCount();

        } else {
@@ -138,7 +138,7 @@ public abstract class CursorAdapter extends BaseAdapter implements Filterable, 
    /**

     * @see android.widget.ListAdapter#getItem(int)

     */

    public final Object getItem(int position) {

    public Object getItem(int position) {

        if (mDataValid && mCursor != null) {

            mCursor.moveToPosition(position);

            return mCursor;
@@ -150,7 +150,7 @@ public abstract class CursorAdapter extends BaseAdapter implements Filterable, 
    /**

     * @see android.widget.ListAdapter#getItemId(int)

     */

    public final long getItemId(int position) {

    public long getItemId(int position) {

        if (mDataValid && mCursor != null) {

            if (mCursor.moveToPosition(position)) {

                return mCursor.getLong(mRowIDColumn);