Mathias Agopian
7f00c4cc37
am 4f5f2786: Merge "fix the threading issue for setBuffercount()" into kraken
2010-05-21 13:55:18 -07:00
Mathias Agopian
3e23593d2f
Merge "fix the threading issue for setBuffercount()" into kraken
2010-05-21 13:53:28 -07:00
Mike Lockwood
b467fb03ae
am f1de96d4: am 8e55e88f: Merge "Fix broken Javadoc links" into kraken
2010-05-21 12:31:02 -07:00
Mike Lockwood
f89f8a0d53
am 8e55e88f: Merge "Fix broken Javadoc links" into kraken
2010-05-21 12:29:26 -07:00
Mike Lockwood
1bb6a71178
Merge "Fix broken Javadoc links" into kraken
2010-05-21 12:28:11 -07:00
Mike Lockwood
b89b616d96
am 41285a71: am 5d12d197: Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:19:00 -07:00
Mike Lockwood
a1ff11613a
am 5d12d197: Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:17:28 -07:00
Mike Lockwood
c32b48e2b6
Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:16:19 -07:00
Mike Lockwood
6ad95e8340
am 23025ffd: am 11c6847d: Merge "Unhide new location manager APIs:" into kraken
2010-05-21 11:19:35 -07:00
Mike Lockwood
92285447fc
am 11c6847d: Merge "Unhide new location manager APIs:" into kraken
2010-05-21 11:17:53 -07:00
Mike Lockwood
22b9e3ef1d
Merge "Unhide new location manager APIs:" into kraken
2010-05-21 11:16:51 -07:00
Mike Lockwood
bc5e569c14
am dc0ca1d5: am 88262733: Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:40:48 -07:00
Mike Lockwood
376f4f6b91
am 88262733: Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:38:52 -07:00
Mike Lockwood
9f715b544a
Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:37:42 -07:00
Andreas Huber
c5f308b2b1
am 132f46ff: am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
2010-05-21 08:13:20 -07:00
Andreas Huber
f0f5b7cea1
am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
2010-05-21 08:11:14 -07:00
Andreas Huber
1a4f294419
Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
2010-05-21 08:09:53 -07:00
Jason Sams
cfdc9b0028
Merge "Remove noise functions and update images processing to use new rs namespace names."
2010-05-20 18:20:21 -07:00
Mathias Agopian
bb641244d7
fix the threading issue for setBuffercount()
...
this change introduces R/W locks in the right places.
on the server-side, it guarantees that setBufferCount()
is synchronized with "retire" and "resize".
on the client-side, it guarantees that setBufferCount()
is synchronized with "dequeue", "lockbuffer" and "queue"
2010-05-20 18:00:42 -07:00
Andreas Huber
e9c1eaf823
am 5e03fd5d: am 4979601f: Make the -o option actually terminate.
2010-05-20 16:36:25 -07:00
Andreas Huber
cd0af02276
am 4979601f: Make the -o option actually terminate.
2010-05-20 16:34:25 -07:00
Andreas Huber
6e25b83c3f
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
3cbfe6d2f9
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
e2ee1feb70
Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
2010-05-20 15:01:07 -07:00
Vasu Nori
a3abf2144f
Merge "close() on anything other than database shouldn't acquire db lock."
2010-05-20 12:42:16 -07:00
James Dong
97feba81f1
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
4898549e45
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
24d7f03d33
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
Daisuke Miyakawa
faed69eec4
Merge "Make vCard code a separated static library."
2010-05-20 11:30:26 -07:00
Daisuke Miyakawa
6f85953a76
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
de904fb82a
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
e621a78d35
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
c31f5af0b9
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
22f6934983
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
5fed07aa18
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
13cecbd225
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
4961520ea2
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
d7d571221c
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
639f95ed10
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
Wu-cheng Li
080f268c00
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
e2a369a34f
am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken
2010-05-20 01:48:26 -07:00
Wu-cheng Li
f001a4ba76
Merge "Fix javadoc of camera focus distances API." into kraken
2010-05-20 01:46:51 -07:00
Dirk Dougherty
3abba995a2
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
93b01549eb
am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.
2010-05-20 00:18:57 -07:00
Dirk Dougherty
2b09d0914c
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
1a4edf5b0d
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
Scott Main
9c81655f23
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
a6da389947
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
417a858c31
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
6beef8e2d8
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