Commit Graph

16958 Commits

Author SHA1 Message Date
Dirk Dougherty
a9da670807 am 1586f713: am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc. 2010-05-24 10:05:14 -07:00
Dirk Dougherty
56ae7714ef am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc. 2010-05-24 10:03:29 -07:00
Dirk Dougherty
1025833d0e am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken

* commit '3cffe1ababdb09f4a90274e25c2f66feee299835':
  Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:01:49 -07:00
Andreas Huber
2d0443dc62 am ec5f8241: am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever... 2010-05-24 10:00:10 -07:00
Andreas Huber
b00f455a99 am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever... 2010-05-24 09:58:02 -07:00
Dirk Dougherty
534663ed7b am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp

* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
  Doc change: Fix incorrect adt version reference etc.
2010-05-24 09:56:47 -07:00
Daniel Sandler
eec2c03762 am c8a041f1: am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken 2010-05-24 05:49:05 -07:00
Daniel Sandler
984e8bd169 am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken 2010-05-24 05:47:03 -07:00
Daniel Sandler
b5f078204e Merge "New shadowy status bar, direct from Z'ha'dum." into kraken 2010-05-24 05:45:56 -07:00
Wu-cheng Li
e59764bbe4 am bcf50325: am bd329ddb: Improve GPS EXIF parameters comments. 2010-05-24 02:34:57 -07:00
Wu-cheng Li
758d053c22 am bd329ddb: Improve GPS EXIF parameters comments. 2010-05-24 02:32:55 -07:00
Chih-Chung Chang
ed95d48f4c am f1c81c51: am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken 2010-05-23 21:07:46 -07:00
Chih-Chung Chang
1bb94cb3f7 am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken 2010-05-23 21:06:39 -07:00
Chih-Chung Chang
6697ed5d4e Merge "Disable CameraServiceTest in a normal build." into kraken 2010-05-23 21:04:01 -07:00
Daisuke Miyakawa
c146f15260 Small fix around intermideate charset (ISO-8859-1).
After a few investigation, it is found that ISO-8859-1 is confirmed to be the
best charset for that use.

Modify comment so that we explicitly mention it.

Change-Id: I16e487fab33964a1665a1dd6991f2e8598f8895e
2010-05-21 17:11:09 -07:00
Vasu Nori
67e364280f Merge "sqlite crashes when closing the database" 2010-05-21 15:48:33 -07:00
Mathias Agopian
1b5bf632f8 am 6099e141: am 25f0bdae: added native_window_set_buffer_count() 2010-05-21 14:38:44 -07:00
Mathias Agopian
8ab024a1e2 am 25f0bdae: added native_window_set_buffer_count() 2010-05-21 14:37:31 -07:00
Mathias Agopian
f10d7fde03 added native_window_set_buffer_count()
this method can be used to change the number of buffers
associated to a native window. the default is two.

Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
2010-05-21 14:34:32 -07:00
Mathias Agopian
44e6d3fcf1 am 9840fe25: am 4f5f2786: Merge "fix the threading issue for setBuffercount()" into kraken 2010-05-21 13:56:48 -07:00
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