24243 Commits

Author SHA1 Message Date
Vasu Nori
fea6f6dcb7 sqlite crashes when closing the database
A change was made in the last CL to ask sqlite for all unfinalized statements
and then finalizing them before closing the database.
But this crashes sqlite! because sqlite's FTS3
module keeps some prepared statements around and they should not
be finalized before closing the database.
(when sqlite is asked for all unfianlized statements, it also returns
the FTS3's reserved prepared statements which should not be
finalized!!)

Change-Id: I141ab4563985b8cd1305a1228c4cb01bc7281bcb
2010-05-21 15:41:58 -07:00
Jason Sams
3f21110a80 Merge "Remove noise functions and update images processing to use new rs namespace names." 2010-05-20 18:20:21 -07:00
Jason Sams
1001a5b97b Remove noise functions and update images processing to use new rs namespace names.
Change-Id: I2dc9b5ec7877acd630bea1a011ecc4a6d43a31eb
2010-05-20 17:56:05 -07:00
Andreas Huber
d67fbc2fc3 am 5e03fd5d: am 4979601f: Make the -o option actually terminate. 2010-05-20 16:36:25 -07:00
Andreas Huber
5e03fd5d83 am 4979601f: Make the -o option actually terminate. 2010-05-20 16:34:25 -07:00
Andreas Huber
4979601f88 Make the -o option actually terminate.
Change-Id: I91b70ee5c3e1fc9b8bb645e219af296867692e65
2010-05-20 16:32:29 -07:00
Andreas Huber
aa2abcd3a9 am e932ea5d: am c05ab485: Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken 2010-05-20 15:04:32 -07:00
Andreas Huber
e932ea5d22 am c05ab485: Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken 2010-05-20 15:02:16 -07:00
Andreas Huber
c05ab485e4 Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken 2010-05-20 15:01:07 -07:00
Andreas Huber
9402038095 Update software AVC decoder to no longer require the kWantsNALFragments hack.
Change-Id: I7f1882530a891a57d0cd76cbbd7084ee31c59bd1
2010-05-20 14:44:10 -07:00
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
James Dong
3ba577e653 am 91b9e5fb: am 85bc1192: Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffe 2010-05-20 12:21:13 -07:00
James Dong
91b9e5fb71 am 85bc1192: Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the def 2010-05-20 12:19:44 -07:00
James Dong
85bc1192ce Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974" into kraken 2010-05-20 12:18:39 -07:00
James Dong
ec9e76f921 Workaround for preview frame rate setting and encoder profile and level settings on passion
1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282
2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974

Change-Id: Id01d94bb77dc242c4712d56a91b0d69a96ba6c2f
2010-05-20 12:01:29 -07:00
Daisuke Miyakawa
422017be68 Merge "Make vCard code a separated static library." 2010-05-20 11:30:26 -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
Andreas Huber
3ec26bdef9 am 2130fc82: am c6a16327: am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo 2010-05-20 11:17:59 -07:00
Andreas Huber
2130fc82c7 am c6a16327: am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo 2010-05-20 11:16:28 -07:00
Andreas Huber
c6a1632732 am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
2010-05-20 11:14:37 -07:00
Andreas Huber
3c16154a33 am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp

* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
2010-05-20 11:13:20 -07:00
Andreas Huber
2723e09229 Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo 2010-05-20 11:11:39 -07:00
Xia Wang
f3a6c73000 am 17530508: am cf7d2d50: am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks. 2010-05-20 11:01:54 -07:00
Xia Wang
1753050811 am cf7d2d50: am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks. 2010-05-20 11:00:22 -07:00
Xia Wang
cf7d2d50a4 am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken

* commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
  If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:58:18 -07:00
Xia Wang
3716ea04d9 am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp

* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
  If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:56:13 -07:00
Andreas Huber
1919e5af3d Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4
related-to-bug: 2699505
2010-05-20 10:37:06 -07:00
Xia Wang
069067963c If the network SSID is a string, it should be enclosed in double quotation marks.
bug id: 2701058

Change-Id: I40e10ba096053710d4974b005d0d2e7c309ccffe
2010-05-20 10:22:59 -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
2ee95ad696 am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken 2010-05-20 01:48:26 -07:00
Wu-cheng Li
5badcabadb Merge "Fix javadoc of camera focus distances API." into kraken 2010-05-20 01:46:51 -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
Dirk Dougherty
a347d4ba47 am b482577a: am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel. 2010-05-20 00:21:00 -07:00
Dirk Dougherty
b482577a1b am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel. 2010-05-20 00:18:57 -07:00
Dirk Dougherty
a6638606c2 am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.
Merge commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken

* commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf':
  Doc change: Add new tv to carousel.
2010-05-20 00:17:14 -07:00
Dirk Dougherty
41a254cf1b am dc737ca9: Doc change: Add new tv to carousel.
Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp

* commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6':
  Doc change: Add new tv to carousel.
2010-05-20 00:15:41 -07:00
Dirk Dougherty
dc737ca986 Doc change: Add new tv to carousel.
Change-Id: Ibd36247bbab26d8d4a8e8c15a1d852a2f9cb0269
2010-05-19 23:50:10 -07: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
Scott Main
cc92cea8fa am 5619e3ad: am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:31:03 -07:00
Scott Main
5619e3ad27 am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:29:31 -07:00
Scott Main
1442290ad4 am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken

* commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac':
  docs: add youtube video to highlights
2010-05-19 20:27:21 -07:00
Scott Main
cf7579148a am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp

* commit '55f383a9b8da99aa48857fea27a35badc515d8bd':
  docs: add youtube video to highlights
2010-05-19 20:25:15 -07:00
Scott Main
55f383a9b8 Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:24:18 -07:00
Scott Main
2324abdb3c docs: add youtube video to highlights
Change-Id: Ib498ab7e18d6e54df35009b4255fce96f11bcb39
2010-05-19 20:16:06 -07:00
Scott Main
f1b59b7e67 am 67d8dce3: am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo 2010-05-19 19:35:12 -07:00
Scott Main
67d8dce31c am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo 2010-05-19 19:33:44 -07:00
Scott Main
fa966de213 am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken

* commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926':
  doc: add developing and testing info to backup guide
2010-05-19 19:32:25 -07:00
Scott Main
864c3d1b90 am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp

* commit '8025989957e5b6ad51e99a69a0e1e753e40cba67':
  doc: add developing and testing info to backup guide
2010-05-19 19:30:29 -07:00