Dianne Hackborn 36e5f667bc resolved conflicts for merge of 2eb12a47 to master ...

Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99

2010-06-24 16:29:54 -07:00

..

sqlite

resolved conflicts for merge of 2eb12a47 to master

2010-06-24 16:29:54 -07:00

AbstractCursor.java

add API to Cursor to get column value type

2010-06-02 17:40:41 -07:00

AbstractWindowedCursor.java

add API to Cursor to get column value type

2010-06-02 17:40:41 -07:00

BulkCursorNative.java

Remove the deprecated cursor methods.

2010-05-13 23:44:09 -05:00

BulkCursorToCursorAdaptor.java

Remove the deprecated cursor methods.

2010-05-13 23:44:09 -05:00

CharArrayBuffer.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentObservable.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentObserver.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CrossProcessCursor.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Cursor.java

add API to Cursor to get column value type

2010-06-02 17:40:41 -07:00

CursorIndexOutOfBoundsException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CursorJoiner.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CursorToBulkCursorAdaptor.java

Remove the deprecated cursor methods.

2010-05-13 23:44:09 -05:00

CursorWindow.java

fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591

2010-06-14 15:57:30 -07:00

CursorWrapper.java

Add getWrappedCursor, and update the JavaDoc.

2010-06-21 10:23:52 -07:00

DatabaseErrorHandler.java

allow apps to specify actions to take on database corruption error

2010-04-15 09:31:47 -07:00

DatabaseUtils.java

add API to Cursor to get column value type

2010-06-02 17:40:41 -07:00

DataSetObservable.java

several minor bugs and things listed below

2010-04-16 15:50:41 -07:00

DataSetObserver.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DefaultDatabaseErrorHandler.java

when corruption occurs, not clsing the db is casuing stack overflow

2010-06-22 12:22:31 -07:00

IBulkCursor.java

Remove the deprecated cursor methods.

2010-05-13 23:44:09 -05:00

IContentObserver.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MatrixCursor.java

add API to Cursor to get column value type

2010-06-02 17:40:41 -07:00

MergeCursor.java

add API to Cursor to get column value type

2010-06-02 17:40:41 -07:00

Observable.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

RequeryOnUiThreadException.java

several minor bugs and things listed below

2010-04-16 15:50:41 -07:00

SQLException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

StaleDataException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00