Vasu Nori
62697e57ed
Merge "close() on anything other than database shouldn't acquire db lock."
2010-05-20 12:42:16 -07:00
Vasu Nori
6f37f83a48
close() on anything other than database shouldn't acquire db lock.
...
bug:2683001
implmentation details:
1.close() on any sql statement is should simply queued up for finalization
to be performed later. caller doesn't acquire database lock.
2. the only effect of NOT close immediately is non-release of some memory.
3. all such queued-up-finalizations are performed whenever there is
another execute() of some sql statement on that database from ANY
thread in the process.
4. database close() automatically releases all unfinalized statements
before closing the database.
Change-Id: If4c9c7fde6b8945a41abc6c8b992aa8c69854512
2010-05-20 12:35:17 -07:00
Daisuke Miyakawa
64545a8ced
Make vCard code a separated static library.
...
- Move the library to a separate directory in framewokr/base, and rename its package from
android.pim.vcard to com.android.vcard.
- Move all tests for the library under the directory.
- Confirm all tests for vCard are successful.
It would be better for us to have this directory somewhere else (like external/).
But I'll submit this here now and move it to the right place as soon as possible.
From the view of build mechanism, we can do that immediately.
BUG: 2689523
Change-Id: I435e10571b7160bfcc029bed7c37aaac1c6fd69a
2010-05-20 11:25:37 -07:00
Wu-cheng Li
ee714613e8
am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken
2010-05-20 01:50:23 -07:00
Wu-cheng Li
185cc455a8
Fix javadoc of camera focus distances API.
...
bug:1955650
Change-Id: I073eb533dd1d5fcebbaa430de9af2bf4335c406e
2010-05-20 16:33:51 +08:00
Dianne Hackborn
cddfa6de1f
Fix sdk build.
...
Change-Id: I4106de6c85d69a68d80414db5dbf5cf48685ce54
2010-05-19 22:56:37 -07:00
Romain Guy
df36b0579e
Prevent crash when changing adapter.
...
Bug #2697842
Change-Id: I3f94c7907c8881145638b9e9307458f1431d7e57
2010-05-19 21:16:02 -07:00
Dianne Hackborn
5ae74d6e89
More fragment work.
...
Clean up FragmentTransaction API, add more animation control, add new
Fragment APIs for hiding and showing.
Change-Id: Iffe31351024a7a63d164270b8a955a499076600e
2010-05-19 19:25:38 -07:00
Vasu Nori
85f08f9eae
DatabaseCorruptionHandler causes NPE
...
it is trying to get attachedDb list (by executing a pragma) after closing
the database.
also added unittests.
Change-Id: I7dce665ec7354402cdef6fbe055455f5798e123c
2010-05-19 13:55:09 -07:00
The Android Open Source Project
a2f2a34d51
am 6af002b7: am b32a74c7: am ee1cdd0e: merge from open-source master
2010-05-19 09:45:51 -07:00
The Android Open Source Project
b32a74c73b
am ee1cdd0e: merge from open-source master
...
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken
* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
Don't allow invalid Uris to be added as observers.
2010-05-19 09:43:20 -07:00
The Android Open Source Project
ee1cdd0e60
merge from open-source master
...
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
2010-05-19 09:36:55 -07:00
The Android Open Source Project
ec4eff80cd
am e23c404a: am bea97a89: am 2dc7c6c4: merge from open-source master
2010-05-19 09:26:24 -07:00
The Android Open Source Project
bea97a897b
am 2dc7c6c4: merge from open-source master
...
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken
* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
Add and document .nomedia constant for MediaStore (Issue 6365)
2010-05-19 09:22:21 -07:00
The Android Open Source Project
2dc7c6c415
merge from open-source master
...
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
2010-05-19 09:20:22 -07:00
Romain Guy
bcb62f099a
Merge "Don't allow invalid Uris to be added as observers."
2010-05-19 09:03:57 -07:00
The Android Open Source Project
75095f693a
am 34b1c116: am b39b0f32: am faf9a783: merge from open-source master
2010-05-19 08:44:59 -07:00
The Android Open Source Project
b39b0f32d1
am faf9a783: merge from open-source master
...
Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken
* commit 'faf9a78363b0c773b95c9b43263d788aee313054':
Text disappears when selecting text in text editor.
2010-05-19 08:41:26 -07:00
The Android Open Source Project
faf9a78363
merge from open-source master
...
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
2010-05-19 08:39:13 -07:00
The Android Open Source Project
39ccc0811f
am 56d4bcd8: am 627356ce: am d6c0bb0f: merge from open-source master
2010-05-19 08:36:58 -07:00
The Android Open Source Project
627356cee4
am d6c0bb0f: merge from open-source master
...
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken
* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
Removed Calls to deprecated APIs
2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f
merge from open-source master
...
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
Anthony Newnam
f51266471c
Don't allow invalid Uris to be added as observers.
...
If a null segment is added, it will cause problems traversing the list
at a later point.
Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
2010-05-19 07:39:07 -05:00
Romain Guy
e02a63f012
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
2010-05-19 00:03:34 -07:00
Romain Guy
7a029da6d6
Merge "Text disappears when selecting text in text editor."
2010-05-19 00:01:55 -07:00
Dianne Hackborn
b269735ca0
am 4a30bcf7: am 74323fd1: Update NativeActivity to allow direct surface access.
2010-05-18 18:28:57 -07:00
Jaikumar Ganesh
2e096c232c
am 13da084d: am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
2010-05-18 18:27:50 -07:00
Dianne Hackborn
9b081a809a
resolved conflicts for merge of 8b625a95 to master
...
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
2010-05-18 18:21:07 -07:00
Dianne Hackborn
74323fd1ab
Update NativeActivity to allow direct surface access.
...
No actual native API for using a surface, but it's a step.
Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
2010-05-18 18:16:35 -07:00
Jaikumar Ganesh
c4bdb6d5a0
am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken
* commit 'ea6f6755ce15133238938bd9626b69e5f655a49c':
Removing STOPSHIP logs.
2010-05-18 14:53:39 -07:00
Jaikumar Ganesh
ea6f6755ce
am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
ef95acebdc
Merge "Removing STOPSHIP logs." into froyo
2010-05-18 14:48:05 -07:00
Jaikumar Ganesh
af21fa61c2
Removing STOPSHIP logs.
...
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
2010-05-18 14:36:48 -07:00
Dianne Hackborn
dc8a7f69d7
Add new API to take over a window's Surface.
...
Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
2010-05-18 10:46:33 -07:00
Jeff Hamilton
f6e9a082a2
Merge "Another try at fixing the docs build."
2010-05-18 09:14:36 -07:00
Scott Main
5ddfac4239
am 68cc7187: am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
2010-05-18 09:12:37 -07:00
Jeff Hamilton
7860b10d16
Another try at fixing the docs build.
...
Change-Id: Ief60f4e71efee1d3bb4ee36e2f2a2fcaeb996284
2010-05-18 11:11:57 -05:00
Scott Main
8473259ddb
am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
2010-05-18 09:07:39 -07:00
Scott Main
74e151c54c
am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
2010-05-18 09:02:09 -07:00
Scott Main
e3b9f8b9b2
docs: fix markup error
...
Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
2010-05-18 08:43:11 -07:00
Jeff Hamilton
e5c50c6211
Merge "Fix a broken docs link."
2010-05-18 08:35:36 -07:00
Jeff Hamilton
e6c6d09a7e
Fix a broken docs link.
...
Change-Id: I2e940165726ecfce306cd143ed049045c927b6a0
2010-05-18 10:34:47 -05:00
Steve Block
5de72739b7
Merge "Make sure Geolocation is robust to location providers being absent on the device."
2010-05-18 08:28:42 -07:00
Jeff Hamilton
e188664f8a
Merge "Add the Loader and supporting classes."
2010-05-18 07:24:50 -07:00
Steve Block
3d9e066ab3
Make sure Geolocation is robust to location providers being absent on the device.
...
Bug: 2692830
Change-Id: I19f88e20f00fe7ecfb77c06197213d273bd80411
2010-05-18 15:16:55 +01:00
Jeff Hamilton
9911b7f83d
Add the Loader and supporting classes.
...
Loaders are designed to make it easier to manage
asynchronously loading data.
Change-Id: I948db08c721411e94fca071dc6fb4db2b83ea4d6
2010-05-18 00:07:15 -05:00
Grace Kloba
5e02c431a3
If we can't scroll any more, stop the animation and
...
resume update. Otherwise, we can't touch select until
the scroller animation is done.
Fix http://b/issue?id=2666473
2010-05-17 20:38:21 -07:00
Grace Kloba
3c19d99042
If the new fling is much slower (less than 1/5 of
...
the previous fling), don't accelerate it.
Fix http://b/issue?id=2672074
2010-05-17 20:34:08 -07:00
Scott Main
b3976bb395
am 0583ac4c: am 9719fe11: am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
2010-05-17 18:07:55 -07:00
Scott Main
9719fe11a1
am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
...
Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken
* commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9':
docs: revise webview description and add info for targeting screen densities
2010-05-17 18:04:07 -07:00