summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Hamilton <> 2009-03-24 19:32:26 -0700
committer The Android Open Source Project <initial-contribution@android.com> 2009-03-24 19:32:26 -0700
commit2c6b3b0c26b8efc40035fb70eec8562016c116a2 (patch)
tree7d74dc8520bc8f7e0b1de6c52a9cffeda8d66220
parent95e4f70624ae9695bdd9029eb22a9e271401fbd5 (diff)
Automated import from //branches/master/...@141107,141107
-rw-r--r--api/3.xml6
-rw-r--r--api/current.xml6
-rw-r--r--core/java/android/widget/CursorAdapter.java6
3 files changed, 9 insertions, 9 deletions
diff --git a/api/3.xml b/api/3.xml
index 512fef8b184f..c75281319230 100644
--- a/api/3.xml
+++ b/api/3.xml
@@ -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"
>
diff --git a/api/current.xml b/api/current.xml
index 06f97f7efcaa..b4e8a259a35a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -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"
>
diff --git a/core/java/android/widget/CursorAdapter.java b/core/java/android/widget/CursorAdapter.java
index 898e501a183f..da90a9f40294 100644
--- a/core/java/android/widget/CursorAdapter.java
+++ b/core/java/android/widget/CursorAdapter.java
@@ -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);