diff options
| author | Dianne Hackborn <> | 2009-04-13 16:13:37 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-13 16:13:37 -0700 |
| commit | 75534fbe246e5562779500bc7cf7f0ddfe9b8330 (patch) | |
| tree | 891f8567ac33ffa06c4f40af30c82c8feecb71c2 /core/java/android/database | |
| parent | 0f87ca2037e60dc4b988838b510bc8c1576e7d6b (diff) | |
| parent | 935ae463d495d41155e27feb849768ad2b8b16db (diff) | |
| download | frameworks_base-75534fbe246e5562779500bc7cf7f0ddfe9b8330.zip frameworks_base-75534fbe246e5562779500bc7cf7f0ddfe9b8330.tar.gz frameworks_base-75534fbe246e5562779500bc7cf7f0ddfe9b8330.tar.bz2 | |
Merge branch 'readonly-p4-master'
Diffstat (limited to 'core/java/android/database')
| -rw-r--r-- | core/java/android/database/AbstractCursor.java | 6 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteDatabase.java | 5 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteQuery.java | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java index 76f0860..038eedf 100644 --- a/core/java/android/database/AbstractCursor.java +++ b/core/java/android/database/AbstractCursor.java @@ -463,14 +463,16 @@ public abstract class AbstractCursor implements CrossProcessCursor { } /** - * @hide pending API council approval + * This is hidden until the data set change model has been re-evaluated. + * @hide */ protected void notifyDataSetChange() { mDataSetObservable.notifyChanged(); } /** - * @hide pending API council approval + * This is hidden until the data set change model has been re-evaluated. + * @hide */ protected DataSetObservable getDataSetObservable() { return mDataSetObservable; diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 2af080a..7d331dc 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -1143,7 +1143,10 @@ public class SQLiteDatabase extends SQLiteClosable { * @param initialRead set the initial count of items to read from the cursor * @param maxRead set the count of items to read on each iteration after the first * @return A {@link Cursor} object, which is positioned before the first entry - * @hide pending API council approval + * + * This work is incomplete and not fully tested or reviewed, so currently + * hidden. + * @hide */ public Cursor rawQuery(String sql, String[] selectionArgs, int initialRead, int maxRead) { diff --git a/core/java/android/database/sqlite/SQLiteQuery.java b/core/java/android/database/sqlite/SQLiteQuery.java index 1386a0d..cdd9f86 100644 --- a/core/java/android/database/sqlite/SQLiteQuery.java +++ b/core/java/android/database/sqlite/SQLiteQuery.java @@ -131,7 +131,6 @@ public class SQLiteQuery extends SQLiteProgram { } } - /** {@hide pending API Council approval} */ @Override public String toString() { return "SQLiteQuery: " + mQuery; |