Commit Graph

31 Commits

Author SHA1 Message Date
Dianne Hackborn
4a51c20ce6 I am getting tired of the java doc warnings, so fix them.
Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
2009-08-24 17:37:32 -07:00
Android (Google) Code Review
1186bb1eca am ae1ba650: Merge change 8227 into donut
Merge commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383'

* commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383':
  Handle null in MatrixCursor.get*()
2009-07-22 13:29:31 -07:00
Bjorn Bringert
f2cec58d90 Handle null in MatrixCursor.get*()
Before, if a column contained null, MatrixCursor.getString()
returned the string "null", and the get<Number>() methods
threw exceptions.

Now, getString() returns null, and get<Number>() return 0.

Fixes http://b/issue?id=1996628
2009-07-22 21:20:51 +01:00
Android (Google) Code Review
578cf8104b am aa0e47cb: Merge change 8179 into donut
Merge commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38'

* commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38':
  Fix SQL generated by updateWithOnConflict()
2009-07-22 11:27:18 -07:00
Bjorn Bringert
7f4c2ea378 Fix SQL generated by updateWithOnConflict()
Before, SQLiteDatabase.updateWithOnConflict() method generated
syntactically invalid SQL if the ConflictAlgorithm was non-null.
For example, it would generate
"UPDATE  OR REPLACEshortcuts SET ...",
when it should be "UPDATE OR REPLACE shortcuts SET ...".

Fixes http://b/issue?id=1995470
2009-07-22 12:49:17 +01:00
Android (Google) Code Review
ffe4ddfe95 am eb717b9c: Merge change 4477 into donut
Merge commit 'eb717b9c4337e5b88664802b0804f4cb48758120'

* commit 'eb717b9c4337e5b88664802b0804f4cb48758120':
  BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
2009-06-22 13:04:50 -07:00
Karl Rosaen
6dc0ef005d BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
This fixes bug 1923131 which was crashing the system process in some cases when the search dialog
was calling respond on its cursor to GlobalSearch.
2009-06-22 12:51:35 -07:00
Bjorn Bringert
7fb952ac23 Allow making AssetFileDescriptors from SQLite blobs.
This change adds a new class SQLiteContentHelper, which contains
a static method for creating an AssetFileDescriptor from
an SQLite query that returns a blob.

Internally, this uses a file descriptor for a MemoryFile.

The implementation is temporary. Ideally, the data should be copied
directly from SQLite to the MemoryFile ashmem region, using
sqlite3_blob_read().

This is part of the implementation of http://b/issue?id=1871731
2009-06-04 09:57:18 -07:00
Bjorn Bringert
c55e08e3fc Allow making AssetFileDescriptors from SQLite blobs.
This change adds a new class SQLiteContentHelper, which contains
a static method for creating an AssetFileDescriptor from
an SQLite query that returns a blob.

Internally, this uses a file descriptor for a MemoryFile.

The implementation is temporary. Ideally, the data should be copied
directly from SQLite to the MemoryFile ashmem region, using
sqlite3_blob_read().

This is part of the implementation of http://b/issue?id=1871731
2009-06-03 12:53:43 +01:00
Fred Quintana
03d9490758 - create a new generic ISyncAdapter implementation, SyncAdapterNew
- change the applyBatch to take an ArrayList rather than an []
 - change Entity to be a final flass that contains ContentValues
 - remove the ability to update/insert Entities by a ContentProviderOperation
2009-06-01 16:17:03 -07:00
Android (Google) Code Review
158d83054f am a64f5f61: Merge change 1124 into donut
Merge commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb'

* commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb':
  Fix SQLite limit issue.
2009-05-27 11:01:30 -07:00
Fred Quintana
8943737692 add ipc support to batching 2009-05-22 14:17:48 -07:00
Owen Lin
ab18d1f46a Fix SQLite limit issue.
SQLLite limit is not only used to limit the returned number of data.
It can be used to do an offset query.

For example, "SELECT * FROM table LIMIT 100, 10", will return the
data of index in the range of [100, 100 + 10).

This change set enable this kind of useage.

This is also more efficient than use "cursor.moveToPosition()".
In my experiment, I query 1000 items in batch mode, i.e.,
get 20 items out of 1000 each time.

    Time of using LIMIT clause: 626ms
    Time of useing "cursor.moveToPosition()": 2062ms
2009-05-21 15:22:28 -07:00
Android (Google) Code Review
090d32b275 am 9ae8873: Merge change 617 into donut
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'

* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
  Allow caller-supplied column aliases in queries even when a projection map is used.
2009-04-29 13:41:23 -07:00
Michael Chan
99c4483cd7 Allow caller-supplied column aliases in queries even when a projection map is used.
Modified SQLiteQueryBuilder to allow caller-spplied column alias ("AS")
instead restricting to the keys of the supplied projection map.  This is needed for
UNION queries where new columns may be created on the fly such as "1 AS flag"
2009-04-27 16:32:45 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Andy Stadler
f8a7ceaef2 AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
2009-03-29 08:55:27 -07:00
Fred Quintana
22f711423e Automated import from //branches/master/...@141380,141380 2009-03-24 20:10:17 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
4df2423a94 auto import from //depot/cupcake/@136594 2009-03-05 14:34:35 -08:00
Yusuke Ohmichi(maimuzo)
accbadeb52 fix issue #1587 2009-03-04 14:14:21 -08:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856 auto import from //depot/cupcake/@132589 2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a auto import from //depot/cupcake/@137055 2009-03-02 22:54:33 -08:00
The Android Open Source Project
3001a03543 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:31 -08:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
The Android Open Source Project
f013e1afd1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9 Initial Contribution 2008-10-21 07:00:00 -07:00